7317 files changed, 21226 insertions, 45232 deletions

diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index d2ac1e9ea8..7dcc2a18ba 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 90d432a53d..2b056993d4 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaplayer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 3dc7d2d235..05e41ec388 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediatoolbox.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 116987699c..4e49f0a96b 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindow.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index d5148aeacd..c991cbb8c6 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpids.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 6a257d59fa..1cfa217c0d 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediacontrol.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 12956725b7..1eef633fc9 100644
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 4675da3ac3..8583af64ed 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediacontrol.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index e940b6a3af..fd26a83a7e 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediacontrol.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 109647e7e0..9b06a117ff 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediacontrol.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 3ebfc5b74a..465141f9ad 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaitem.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 28a3598e45..783a3ac8ab 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediamisc.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 1042c8e670..0d646bedfd 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaplayer.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 5e94fb34fc..149fc5af2c 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediatoolbox.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index aa6044fe12..e7f3b06b70 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soundhandler.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 8aa6780099..71d755e0d9 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: soundhandler.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 1ff044d57b..3034d6bd9a 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediamisc.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
index 40ee5816a0..fced00fc99 100644
--- a/avmedia/source/java/FrameGrabber.java
+++ b/avmedia/source/java/FrameGrabber.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FrameGrabber.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
index 0b3bb19dda..a275e2771b 100644
--- a/avmedia/source/java/Manager.java
+++ b/avmedia/source/java/Manager.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Manager.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
index 89413ce930..7420052dc1 100644
--- a/avmedia/source/java/MediaUno.java
+++ b/avmedia/source/java/MediaUno.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MediaUno.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
index a5b1aacddd..10fecc9d27 100644
--- a/avmedia/source/java/Player.java
+++ b/avmedia/source/java/Player.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Player.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
index 590228f59c..f72f3dff4d 100644
--- a/avmedia/source/java/PlayerWindow.java
+++ b/avmedia/source/java/PlayerWindow.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PlayerWindow.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
index b06c4bb4cc..984f09aa3e 100644
--- a/avmedia/source/java/WindowAdapter.java
+++ b/avmedia/source/java/WindowAdapter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WindowAdapter.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index b445aa87d6..94aebeaa32 100644
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -26,7 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#     
+#
 #**************************************************************************
 
 # Builds the Java Canvas implementation.
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
index 9767816ad4..ebf3cac993 100644
--- a/avmedia/source/java/win/SystemWindowAdapter.java
+++ b/avmedia/source/java/win/SystemWindowAdapter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SystemWindowAdapter.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
index b6229515a7..0dd3ccd0ad 100644
--- a/avmedia/source/java/x11/SystemWindowAdapter.java
+++ b/avmedia/source/java/x11/SystemWindowAdapter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SystemWindowAdapter.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index 51dc28069c..ee60ea8e8d 100644
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/avmedia/source/quicktime/framegrabber.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framegrabber.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index c4d83cadb4..86d816eda5 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framegrabber.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index a087e80075..f2157b2e7a 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
index 59e790159f..4970864c7e 100644
--- a/avmedia/source/quicktime/manager.cxx
+++ b/avmedia/source/quicktime/manager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: manager.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 662ada13b3..07740a1a92 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: manager.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index aa2d86d340..cfff821b66 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: player.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index ccc360e5ef..8f1ec7d3d7 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: player.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index b6f6474175..82ade23839 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: quicktimecommon.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index 16cc8caf18..d66f1506ac 100644
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: quicktimeuno.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 9fff6d77ff..29c230fe9e 100644
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 90933ceed8..4ca2e76ddc 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
index 2e80253d98..2d388484cc 100644
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/source/viewer/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index c450e09785..cf86f54df8 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaevent_impl.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index c02a4c26b1..8a998c8fcc 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediaevent_impl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f6ca9f0d75..242887d775 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindow.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 7fbea4595f..1c92b4d913 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindow.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 9ea9742402..73ebbffd86 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindow_impl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index e84f4c2c83..cce4935e81 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindow_impl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 8fb63bdfc5..99ba199f27 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindowbase_impl.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index dd76564913..59496b4b7f 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediawindowbase_impl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index a7d1b6bf26..1dac92ff4e 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framegrabber.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 7922bc8a0f..17085571fe 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framegrabber.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index d31c544ebb..a5928139e7 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interface.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index a4f503910d..0b52905a69 100644
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 8c839de0c1..13bc1e4fe5 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: manager.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index e7be1914f1..1bb3e530c0 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: manager.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index c5ee611b83..14c9037e8f 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: player.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index bacba92688..08ad181833 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: player.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index f16dabf4d0..502f430027 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wincommon.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index b771504f7d..e89f98f5ee 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 74906cb75e..36cff49a74 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index cef4891651..6478e27a32 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: winuno.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/makefile.mk b/avmedia/source/xine/makefile.mk
index 2b462a53c9..8170638c4f 100644
--- a/avmedia/source/xine/makefile.mk
+++ b/avmedia/source/xine/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/avmedia/source/xine/manager.cxx b/avmedia/source/xine/manager.cxx
index be4a5623af..46b4d52f73 100644
--- a/avmedia/source/xine/manager.cxx
+++ b/avmedia/source/xine/manager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: manager.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx
index 518549f4e9..b8faf2774f 100644
--- a/avmedia/source/xine/manager.hxx
+++ b/avmedia/source/xine/manager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: manager.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/player.cxx b/avmedia/source/xine/player.cxx
index 5b44d7ae1c..8ef55208b7 100644
--- a/avmedia/source/xine/player.cxx
+++ b/avmedia/source/xine/player.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: player.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx
index 0bd99aae77..b1e18613fb 100644
--- a/avmedia/source/xine/player.hxx
+++ b/avmedia/source/xine/player.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: player.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/window.cxx b/avmedia/source/xine/window.cxx
index 3c34e36ff0..05bf337585 100644
--- a/avmedia/source/xine/window.cxx
+++ b/avmedia/source/xine/window.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx
index 9db6885b95..140f8d9b09 100644
--- a/avmedia/source/xine/window.hxx
+++ b/avmedia/source/xine/window.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/xinecommon.hxx b/avmedia/source/xine/xinecommon.hxx
index cbff2d1757..fe80a75370 100644
--- a/avmedia/source/xine/xinecommon.hxx
+++ b/avmedia/source/xine/xinecommon.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xinecommon.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx
index 6c54cd1af3..0d01ad1d7d 100644
--- a/avmedia/source/xine/xineuno.cxx
+++ b/avmedia/source/xine/xineuno.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xineuno.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/util/hidother.src b/avmedia/util/hidother.src
index b29ccade41..36b873dd06 100755..100644
--- a/avmedia/util/hidother.src
+++ b/avmedia/util/hidother.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index 67aa2135d4..17e5c2fd85 100644
--- a/avmedia/util/makefile.mk
+++ b/avmedia/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index 63d76a60cb..c4ff6d5150 100644
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicmanagerrepository.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 03bb45d288..6d50e1cddc 100644
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicrt.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 3285c09527..cd5dca25bd 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmgr.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index 400c520403..8363cafc8e 100644
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basrdll.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/dispdefs.hxx b/basic/inc/basic/dispdefs.hxx
index 89dd6839fb..1b68e67d88 100644
--- a/basic/inc/basic/dispdefs.hxx
+++ b/basic/inc/basic/dispdefs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispdefs.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index c455783448..983ba1a1bc 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mybasic.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index ccc0e003a0..20cdbe1d4a 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: process.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index c13cd69378..9863ae2f8d 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbdef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index bd0196708c..f4310f3d8d 100644
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sberrors.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 2e1a8a1133..dfb3b2cda2 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbmeth.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index b309179ea5..7ec8225498 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbmod.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index b28225dcf6..8d655050de 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbprop.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index f71d1ff2fd..a4613e74b3 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbstar.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx
index a4e3e1e826..4bb0e0c3e7 100644
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/basic/inc/basic/sbstdobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbstdobj.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx
index b4f9f4b61f..68e2c6ab87 100644
--- a/basic/inc/basic/sbuno.hxx
+++ b/basic/inc/basic/sbuno.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbuno.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 0a686e5d96..d22582572c 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbx.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 577e509b28..dc63053a7b 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxbase.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 2a424d94d2..05d8cdb329 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxcore.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 8797d8e912..c67cdcfdfb 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxdef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index 8354ff0b23..d86385fe14 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxfac.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index 326fb83acc..15f4ef0434 100644
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxform.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 27accc0edd..8ff9f18025 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxmeth.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
index 658feefefb..ebd6a2b934 100644
--- a/basic/inc/basic/sbxmstrm.hxx
+++ b/basic/inc/basic/sbxmstrm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxmstrm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index a517b4375e..5809a59184 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxobj.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index 3543b3e1e6..3cc7a9dfb3 100644
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxprop.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 57648fc025..927e44b869 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxvar.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index a425844ce5..0c409fc0a1 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testtool.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/ttglobal.hrc b/basic/inc/basic/ttglobal.hrc
index a79ca954da..b04c30e27a 100644
--- a/basic/inc/basic/ttglobal.hrc
+++ b/basic/inc/basic/ttglobal.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ttglobal.hrc,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 09f8d61a91..68d5da22ab 100644
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ttstrhlp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index be041f3ada..d12d05c343 100644
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basrid.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/makefile.mk b/basic/inc/makefile.mk
index 5910bba963..dc504c2db3 100644
--- a/basic/inc/makefile.mk
+++ b/basic/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/modsizeexceeded.hxx
index 16c91c1027..75180d6966 100644
--- a/basic/inc/modsizeexceeded.hxx
+++ b/basic/inc/modsizeexceeded.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: modsizeexceeded.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/pch/precompiled_basic.cxx b/basic/inc/pch/precompiled_basic.cxx
index 9ea2571c99..c27c1c7a66 100644
--- a/basic/inc/pch/precompiled_basic.cxx
+++ b/basic/inc/pch/precompiled_basic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_basic.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index cd10ee53f3..1a3941f717 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_basic.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index be03905eb0..2b82ba151f 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sb.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index 219b341806..ecc85bfa40 100644
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sb.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/svtmsg.hrc b/basic/inc/svtmsg.hrc
index e9cb0c715a..2827215bc2 100644
--- a/basic/inc/svtmsg.hrc
+++ b/basic/inc/svtmsg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svtmsg.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/testtool.hrc b/basic/inc/testtool.hrc
index 5316574a0c..711f0cb049 100644
--- a/basic/inc/testtool.hrc
+++ b/basic/inc/testtool.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testtool.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/inc/ttmsg.hrc b/basic/inc/ttmsg.hrc
index 8d203d7ea9..6c44194f5b 100644
--- a/basic/inc/ttmsg.hrc
+++ b/basic/inc/ttmsg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ttmsg.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 00a7877fcf..208cbbc06d 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.cxx,v $
- * $Revision: 1.79.14.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index f348689773..5beea4788f 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 657b44e55a..3b96211e33 100644
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appbased.cxx,v $
- * $Revision: 1.13.20.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx
index f12b805240..41d7f0eace 100644
--- a/basic/source/app/appbased.hxx
+++ b/basic/source/app/appbased.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appbased.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index 122aa9c7a1..4ec05b2c34 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appedit.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx
index 3eb128da77..3434f753bf 100644
--- a/basic/source/app/appedit.hxx
+++ b/basic/source/app/appedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appedit.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index d6bb483588..8a37e746db 100644
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apperror.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index c560b1fd7d..64747ff5b1 100644
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apperror.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index ad65d45395..45f8680edf 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appwin.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index 95439f2f06..e607de6875 100644
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appwin.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/basic.hrc b/basic/source/app/basic.hrc
index f4351c41d5..b5c7d7a98a 100644
--- a/basic/source/app/basic.hrc
+++ b/basic/source/app/basic.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basic.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index 0efffe42e2..0467883bec 100644
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basic.src,v $
- * $Revision: 1.67 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx
index a2aa1ff9c9..e6c9f550ad 100644
--- a/basic/source/app/basicrt.cxx
+++ b/basic/source/app/basicrt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicrt.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc
index 5c69689e58..0405eeae66 100644
--- a/basic/source/app/basmsg.hrc
+++ b/basic/source/app/basmsg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmsg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/basmsg.src b/basic/source/app/basmsg.src
index 90bfbec5ce..0ab480f702 100644
--- a/basic/source/app/basmsg.src
+++ b/basic/source/app/basmsg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmsg.src,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index ca75c2dd03..3f06e74c36 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: brkpnts.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index efb19594c1..3ee3461540 100644
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: brkpnts.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx
index cdf6ba679a..68a7638e20 100644
--- a/basic/source/app/dataedit.hxx
+++ b/basic/source/app/dataedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dataedit.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index fa770f985f..6232a734bb 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialogs.cxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index bc7df5ad76..e7c8329587 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialogs.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index 13c3b4a8b5..84835dec1f 100644
--- a/basic/source/app/makefile.mk
+++ b/basic/source/app/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 1ef046170d..29ce347bc8 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msgedit.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 764228341b..ef3637f608 100644
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msgedit.hxx,v $
- * $Revision: 1.11.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 335db6c21c..8ddc023633 100644
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mybasic.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index 424089c27e..249c866c4c 100644
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printer.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index 736b78e497..ee1cd597b4 100644
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 01491f9e9d..3e7ef0f8e3 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: process.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index 9caf34148c..5b59cd8f5e 100644
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: processw.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index ce8d0dcde0..7b714f1f67 100644
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: processw.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/resids.hrc b/basic/source/app/resids.hrc
index 110fa888ec..935df76681 100644
--- a/basic/source/app/resids.hrc
+++ b/basic/source/app/resids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resids.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index 6a90321b0d..c20fe49d66 100644
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/status.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: status.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/status.hxx b/basic/source/app/status.hxx
index 9daa9229aa..ac8df9ea16 100644
--- a/basic/source/app/status.hxx
+++ b/basic/source/app/status.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: status.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index 9619cc04ec..081923e915 100644
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svtmsg.src,v $
- * $Revision: 1.77 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/testbasi.cxx b/basic/source/app/testbasi.cxx
index 0223888c54..b63986b63b 100644
--- a/basic/source/app/testbasi.cxx
+++ b/basic/source/app/testbasi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testbasi.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/testtool.idl b/basic/source/app/testtool.idl
index 5d01db1d56..acda657881 100644
--- a/basic/source/app/testtool.idl
+++ b/basic/source/app/testtool.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testtool.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index faf0372380..245cff6c79 100644
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testtool.src,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index e07cc90885..53981df915 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textedit.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 19efd764c2..990ae5abf0 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textedit.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/ttbasic.cxx b/basic/source/app/ttbasic.cxx
index 993105f89e..98ffc1e4c0 100644
--- a/basic/source/app/ttbasic.cxx
+++ b/basic/source/app/ttbasic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ttbasic.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/ttbasic.hxx b/basic/source/app/ttbasic.hxx
index e3d1235c2c..04d74daa1b 100644
--- a/basic/source/app/ttbasic.hxx
+++ b/basic/source/app/ttbasic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ttbasic.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index 2618461730..7d813d2f73 100644
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ttmsg.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 3c4980e266..cb9af67199 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicmanagerrepository.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 9c690f1c8d..c39564e8f6 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.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: basmgr.cxx,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/basmgr/makefile.mk b/basic/source/basmgr/makefile.mk
index 4252099d26..85c522385e 100644
--- a/basic/source/basmgr/makefile.mk
+++ b/basic/source/basmgr/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 0e5a376bac..919063cff4 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: disas.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index b0c8f4b3c3..5c57af5b6c 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.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: eventatt.cxx,v $
- * $Revision: 1.35.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index d799050724..93d3b14502 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: image.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index 92d0f1194f..1983d49790 100644
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index aed5b2b3c5..80f9e13cf8 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.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: propacc.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 6b22b4f280..3aebf7e4f3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sb.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 5b1454d654..926da0359d 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sb.src,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 41707c6436..e2be1e9342 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbintern.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 70f2150a41..7f2bc106d9 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.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: sbunoobj.cxx,v $
- * $Revision: 1.54 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 21b31020f9..03c83c7594 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.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: sbxmod.cxx,v $
- * $Revision: 1.44.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -531,7 +528,7 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
 {
     // #67781 Rueckgabewerte der Uno-Methoden loeschen
     clearUnoMethods();
-    clearUnoServiceCtors();

+    clearUnoServiceCtors();
 
     ClearUnoObjectsInRTL_Impl_Rek( pBasic );
 
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index 9b26c9747f..182a16535c 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: buffer.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 1b45d28502..6a3c741069 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: codegen.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index dfb9637d06..a0196acc6d 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dim.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -241,12 +238,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             DefEnum( bPrivate );
             return;
         }
-        else if( eCurTok == DECLARE )

-        {

-            Next();

-            DefDeclare( bPrivate ); 

-            return;

-        }

+        else if( eCurTok == DECLARE )
+        {
+            Next();
+            DefDeclare( bPrivate ); 
+            return;
+        }
     }
 
 #ifdef SHARED
@@ -585,42 +582,42 @@ void SbiParser::DefType( BOOL bPrivate )
             else
             {
                 SbxProperty *pTypeElem = new SbxProperty (pElem->GetName(),pElem->GetType());
-                if( pDim )

-                {

-                    SbxDimArray* pArray = new SbxDimArray( pElem->GetType() );	

-                    if ( pDim->GetSize() )

-                    {

-                        // Dimension the target array

-

-                        for ( short i=0; i<pDim->GetSize();++i )

-                        {

-                            INT32 ub = -1;

-                            INT32 lb = nBase;

-                            SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();

-                            ub = pNode->GetNumber();

-                            if ( !pDim->Get( i )->IsBased() ) // each dim is low/up

-                            {

-                                if (  ++i >= pDim->GetSize() ) // trouble

-                                    StarBASIC::FatalError( SbERR_INTERNAL_ERROR );

-                                pNode =  pDim->Get(i)->GetExprNode();

-                                lb = ub;

-                                ub = pNode->GetNumber();

-                            }

-                            else if ( !bCompatible )

-                                ub += nBase;

-                            pArray->AddDim32( lb, ub );      

-                        }

-                        pArray->setHasFixedSize( true );

-                    }

-                    else

-                        pArray->unoAddDim( 0, -1 ); // variant array

-                    USHORT nSavFlags = pTypeElem->GetFlags();

-                    // need to reset the FIXED flag 

-                    // when calling PutObject ( because the type will not match Object ) 	

-                    pTypeElem->ResetFlag( SBX_FIXED );

-                    pTypeElem->PutObject( pArray );

-                    pTypeElem->SetFlags( nSavFlags );

-                }

+                if( pDim )
+                {
+                    SbxDimArray* pArray = new SbxDimArray( pElem->GetType() );	
+                    if ( pDim->GetSize() )
+                    {
+                        // Dimension the target array
+
+                        for ( short i=0; i<pDim->GetSize();++i )
+                        {
+                            INT32 ub = -1;
+                            INT32 lb = nBase;
+                            SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();
+                            ub = pNode->GetNumber();
+                            if ( !pDim->Get( i )->IsBased() ) // each dim is low/up
+                            {
+                                if (  ++i >= pDim->GetSize() ) // trouble
+                                    StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
+                                pNode =  pDim->Get(i)->GetExprNode();
+                                lb = ub;
+                                ub = pNode->GetNumber();
+                            }
+                            else if ( !bCompatible )
+                                ub += nBase;
+                            pArray->AddDim32( lb, ub );      
+                        }
+                        pArray->setHasFixedSize( true );
+                    }
+                    else
+                        pArray->unoAddDim( 0, -1 ); // variant array
+                    USHORT nSavFlags = pTypeElem->GetFlags();
+                    // need to reset the FIXED flag 
+                    // when calling PutObject ( because the type will not match Object ) 	
+                    pTypeElem->ResetFlag( SBX_FIXED );
+                    pTypeElem->PutObject( pArray );
+                    pTypeElem->SetFlags( nSavFlags );
+                }
                 delete pDim;
                 pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() );
             }
@@ -778,7 +775,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
 SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 {
     BOOL bFunc = BOOL( eCurTok == FUNCTION );
-    BOOL bProp = BOOL( eCurTok == GET || eCurTok == SET || eCurTok == LET );

+    BOOL bProp = BOOL( eCurTok == GET || eCurTok == SET || eCurTok == LET );
     if( !TestSymbol() ) return NULL;
     String aName( aSym );
     SbxDataType eType = eScanType;
@@ -899,7 +896,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 //	if( pDef->GetType() == SbxOBJECT )
 //		pDef->SetType( SbxVARIANT ),
 //		Error( SbERR_SYNTAX );
-    if( pDef->GetType() == SbxVARIANT && !( bFunc || bProp ) )

+    if( pDef->GetType() == SbxVARIANT && !( bFunc || bProp ) )
         pDef->SetType( SbxEMPTY );
     return pDef;
 }
@@ -908,11 +905,11 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 
 void SbiParser::Declare()
 {
-    DefDeclare( FALSE );

-}

-

-void SbiParser::DefDeclare( BOOL bPrivate )

-{

+    DefDeclare( FALSE );
+}
+
+void SbiParser::DefDeclare( BOOL bPrivate )
+{
     Next();
     if( eCurTok != SUB && eCurTok != FUNCTION )
       Error( SbERR_UNEXPECTED, eCurTok );
@@ -941,8 +938,8 @@ void SbiParser::DefDeclare( BOOL bPrivate )
             else
                 aPublics.Add( pDef );
 
-            if ( pDef )

-                pDef->SetPublic( !bPrivate );

+            if ( pDef )
+                pDef->SetPublic( !bPrivate );
         }
     }
 }
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 9afcf5262f..a85aa8f981 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: exprgen.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 80fda09ff7..0be146b45f 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: exprnode.cxx,v $
- * $Revision: 1.19.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index b40ae4d1df..952c479a5d 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: exprtree.cxx,v $
- * $Revision: 1.24.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 3d979656f0..f511299d01 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: io.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 624e8604d2..a3fead4f52 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loops.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index ef0e24ad28..703ffc594d 100644
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index c6e9b42c45..1412edf234 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parser.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 34342b57fc..51f82aa6b2 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbcomp.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 07033cd7ea..3f12395051 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scanner.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -196,7 +193,7 @@ BOOL SbiScanner::NextSym()
     }
 
     // Leerstellen weg:
-    while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) )

+    while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) )
         pLine++, nCol++, bSpaces = TRUE;
 
     nCol1 = nCol;
@@ -479,17 +476,17 @@ PrevLineCommentLbl:
 eoln:
     if( nCol && *--pLine == '_' )
     {
-        pLine = NULL; 

-        bool bRes = NextSym();

-        if( bVBASupportOn && aSym.GetBuffer()[0] == '.' )

-        {

-            // object _

-            //    .Method

-            // ^^^  <- spaces is legal in MSO VBA

-            OSL_TRACE("*** resetting bSpaces***"); 

-            bSpaces = FALSE; 

-        }

-        return bRes;

+        pLine = NULL; 
+        bool bRes = NextSym();
+        if( bVBASupportOn && aSym.GetBuffer()[0] == '.' )
+        {
+            // object _
+            //    .Method
+            // ^^^  <- spaces is legal in MSO VBA
+            OSL_TRACE("*** resetting bSpaces***"); 
+            bSpaces = FALSE; 
+        }
+        return bRes;
     }
     else
     {
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 2156756164..9a85d8a700 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: symtbl.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 5846c8c663..22485d643d 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: token.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index bfc0f5f612..569ce2315a 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: buffer.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index 3f6130bd30..acd90f1fac 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: codegen.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/collelem.hxx b/basic/source/inc/collelem.hxx
index 5279ec3475..cd1787d6ff 100644
--- a/basic/source/inc/collelem.hxx
+++ b/basic/source/inc/collelem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: collelem.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/disas.hxx b/basic/source/inc/disas.hxx
index 3295c4b41d..a0b4685868 100644
--- a/basic/source/inc/disas.hxx
+++ b/basic/source/inc/disas.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: disas.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index f2d6164836..b3ef9e26ea 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgcont.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index b41d5aba30..96f0f046cf 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: expr.hxx,v $
- * $Revision: 1.15.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -144,7 +141,7 @@ public:
     SbiExprNode* GetRealNode();		// letzter Knoten in x.y.z
     short GetDepth();               // Tiefe eines Baumes berechnen
     const String& GetString() 		{ return aStrVal; }
-    short GetNumber() 				{ return (short)nVal; }

+    short GetNumber() 				{ return (short)nVal; }
     SbiExprList* GetParameters()	{ return aVar.pPar; }
     SbiExprListVector* GetMoreParameters()	{ return aVar.pvMorePar; }
 
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index f42455282f..e793911def 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filefmt.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 7035e85360..6920a142a7 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: image.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 791439771f..d61b3957ce 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iosys.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index a5e52845ff..a4c361fd07 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: namecont.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
index 31863b8bd6..29e4f68cc1 100644
--- a/basic/source/inc/object.hxx
+++ b/basic/source/inc/object.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: object.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index 4d2685e346..61b65ad610 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opcodes.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 8c00ca2592..b635f5e8dc 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parser.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -66,7 +63,7 @@ class SbiParser : public SbiTokenizer
     void StmntBlock( SbiToken ); 	// Statement-Block abarbeiten
     void DefType( BOOL bPrivate );	// Parse type declaration
     void DefEnum( BOOL bPrivate );	// Parse enum declaration
-    void DefDeclare( BOOL bPrivate );

+    void DefDeclare( BOOL bPrivate );
     void EnableCompatibility();	
 public:
     SbxArrayRef	  rTypeArray;		// das Type-Array
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 663060638b..5f85ccd823 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propacc.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 409f0d76d6..98e5599bf5 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.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: runtime.hxx,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx
index feafa4aa46..e1d123b04d 100644
--- a/basic/source/inc/sbcomp.hxx
+++ b/basic/source/inc/sbcomp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbcomp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index bfe59e9d38..c0d863e404 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbintern.hxx,v $
- * $Revision: 1.16.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 2f151b80f5..80c3018218 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbjsmeth.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 4fa1171027..bde6a926b6 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbjsmod.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 5780113482..56f4cfd7bc 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbunoobj.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index d27167143a..a00cec9bf4 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scanner.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 1475f2e91f..b2b4616f34 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptcont.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index d18c1c294f..000e39973e 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stdobj.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 8b19aa6da6..c82f1da431 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: symtbl.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 1220f7e133..91019bede9 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: token.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 51a1aa00b0..b5e5aa8dad 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basrdll.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 3a88477b5b..2c883a52c0 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ddectrl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index 9276a51ee4..e419d2fa77 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ddectrl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx
index 3e85432da8..1ae216b275 100644
--- a/basic/source/runtime/dllmgr.cxx
+++ b/basic/source/runtime/dllmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dllmgr.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 9cd003e858..4d549ab31a 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dllmgr.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 78445d39af..fd795db86c 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: inputbox.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e4d667ecc0..9a2d452a1c 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.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: iosys.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index 9c9886e05f..7434a1cd4d 100644
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5c1bae13ab..d9807b99ee 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.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: methods.cxx,v $
- * $Revision: 1.82 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1786,9 +1783,9 @@ INT16 implGetDateYear( double aDate )
 
 BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
 {
-    if ( nYear < 30 && SbiRuntime::isVBAEnabled() )

+    if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
         nYear += 2000;
-    else if ( nYear < 100 )

+    else if ( nYear < 100 )
         nYear += 1900;
     Date aCurDate( nDay, nMonth, nYear );
     if ((nYear < 100 || nYear > 9999) )  
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 08a94feefc..99db1b8ef9 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.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: methods1.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/os2.asm b/basic/source/runtime/os2.asm
index 1dd5a296d6..1b81e24720 100644
--- a/basic/source/runtime/os2.asm
+++ b/basic/source/runtime/os2.asm
@@ -1,14 +1,10 @@
 ;*************************************************************************
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2008 by Sun Microsystems, Inc.
 ;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; $RCSfile: os2.asm,v $
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
-; $Revision: 1.4 $
+; OpenOffice.org - a multi-platform office productivity suite
 ;
 ; This file is part of OpenOffice.org.
 ;
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index df5098ebe0..21fc7c82b8 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: props.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index 4ee88b3fb6..1fa3d8a85c 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rtlproto.hxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 87f88ea9e6..e7c7aaf67a 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: runtime.cxx,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 01f4777a7f..a6469cb3af 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stdobj.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 20698ad332..5ebb7391bf 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stdobj1.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index f4fe09a0df..9d35bf81b6 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: step0.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 1f0914dca0..b8dece40bb 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: step1.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 2589207ac9..a6d1a2a9c9 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.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: step2.cxx,v $
- * $Revision: 1.35 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/win.asm b/basic/source/runtime/win.asm
index 252bb43b5d..f57b08ce3d 100644
--- a/basic/source/runtime/win.asm
+++ b/basic/source/runtime/win.asm
@@ -1,14 +1,10 @@
 ;*************************************************************************
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2008 by Sun Microsystems, Inc.
 ;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; $RCSfile: win.asm,v $
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
-; $Revision: 1.4 $
+; OpenOffice.org - a multi-platform office productivity suite
 ;
 ; This file is part of OpenOffice.org.
 ;
diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
index b42c5278c7..80d8749253 100644
--- a/basic/source/runtime/wnt-mingw.s
+++ b/basic/source/runtime/wnt-mingw.s
@@ -1,32 +1,28 @@
 #*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: wnt.asm,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY# without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 #*************************************************************************
 
 #    Anmerkungen
diff --git a/basic/source/runtime/wnt.asm b/basic/source/runtime/wnt.asm
index b4d1bd15d2..6cc5afc90a 100644
--- a/basic/source/runtime/wnt.asm
+++ b/basic/source/runtime/wnt.asm
@@ -1,14 +1,10 @@
 ;*************************************************************************
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2008 by Sun Microsystems, Inc.
 ;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; $RCSfile: wnt.asm,v $
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
-; $Revision: 1.4 $
+; OpenOffice.org - a multi-platform office productivity suite
 ;
 ; This file is part of OpenOffice.org.
 ;
diff --git a/basic/source/sample/collelem.cxx b/basic/source/sample/collelem.cxx
index 577f039c70..4cfe8758b8 100644
--- a/basic/source/sample/collelem.cxx
+++ b/basic/source/sample/collelem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: collelem.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sample/makefile.mk b/basic/source/sample/makefile.mk
index f1802b0e75..648db709b1 100644
--- a/basic/source/sample/makefile.mk
+++ b/basic/source/sample/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index 5f18a51f01..7ba48e2b84 100644
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/object.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: object.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index dde88272eb..7e576134fa 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: format.src,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/makefile.mk b/basic/source/sbx/makefile.mk
index 357ce64df6..de89c23d6b 100644
--- a/basic/source/sbx/makefile.mk
+++ b/basic/source/sbx/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 5aef2609dd..2788b7ceec 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxarray.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 9543817268..4dea587288 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxbase.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index fc9d4616c1..728b8e1472 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxbool.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index a11f346e42..46fbd209db 100644
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxbyte.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index 3e8f9e9e45..80147e3d19 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxchar.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 64af3ac8e0..7bd32900ec 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxcoll.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 2429839be2..c1dcefa124 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxconv.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index ea906ccc01..432194c328 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxcurr.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index efa5daef97..0faadd4f5e 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxdate.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 8cccdc54c2..69d8ce0efd 100644
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxdbl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 0ca63122e3..cc5ce35cae 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxdec.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index bec0b9f845..69bc84a44d 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxdec.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index 234befbff0..c602b130fc 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxexec.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -94,7 +91,7 @@ static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const S
         {
             rSym = p;
             // Dann darf es Buchstaben, Zahlen oder Underlines enthalten
-            while( *p && (rCharClass.isAlphaNumeric( *p ) || *p == '_') )

+            while( *p && (rCharClass.isAlphaNumeric( *p ) || *p == '_') )
                 p++, nLen++;
             // BASIC-Standard-Suffixe werden ignoriert
             if( *p && (*p == '%' || *p == '&' || *p == '!' || *p == '#' || *p == '$' ) )
@@ -118,7 +115,7 @@ static SbxVariable* QualifiedName
     {
         // Element einlesen
         refVar = Element( pObj, pGbl, &p, t, aCharClass );
-        while( refVar.Is() && (*p == '.' || *p == '!') )

+        while( refVar.Is() && (*p == '.' || *p == '!') )
         {
             // Es folgt noch ein Objektelement. Das aktuelle Element
             // muss also ein SBX-Objekt sein oder liefern!
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 42f2d80c7d..840067db52 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxform.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 28bcebf5da..54d0be5e01 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxint.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 537694ecca..f58389523f 100644
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxlng.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
index de975626df..671c0bc5d1 100644
--- a/basic/source/sbx/sbxmstrm.cxx
+++ b/basic/source/sbx/sbxmstrm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxmstrm.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 7f8584d889..3afbe78832 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxobj.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index fa900265d4..b6f681df14 100644
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxres.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index 9ef1e1ca1a..fbfd7b802c 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxres.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 07a3012b60..d4717f0de7 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxscan.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 80d796495f..504e14407a 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxsng.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index fe8ebd5b0b..814b7f61c8 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxstr.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 5674fd6a5f..43c7e63a3e 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxuint.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index eaf7b86b43..1c0f302b3b 100644
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxulng.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx
index b5a27e3718..e63a352879 100644
--- a/basic/source/sbx/sbxvals.cxx
+++ b/basic/source/sbx/sbxvals.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxvals.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 4779a85443..dc54d11c1d 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxvalue.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -1573,9 +1570,9 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
         {
             aL.eType = aR.eType = SbxDOUBLE;
             //if( Get( aL ) && rOp.Get( aR ) )
-            bool bGetL = Get( aL );

-            bool bGetR = rOp.Get( aR );

-            if( bGetL && bGetR )

+            bool bGetL = Get( aL );
+            bool bGetR = rOp.Get( aR );
+            if( bGetL && bGetR )
               switch( eOp )
             {
                 case SbxEQ:
@@ -1593,17 +1590,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
                 default:
                     SetError( SbxERR_NOTIMP );
             }
-            // at least one value was got

-            // if this is VBA then a conversion error for one

-            // side will yield a false result of an equality test

-            else if ( bGetR || bGetL )

-            {

-                if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )

-                {

-                    ResetError();

-                    bRes = FALSE;

-                }

-            }

+            // at least one value was got
+            // if this is VBA then a conversion error for one
+            // side will yield a false result of an equality test
+            else if ( bGetR || bGetL )
+            {
+                if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )
+                {
+                    ResetError();
+                    bRes = FALSE;
+                }
+            }
         }
     }
     if( eOld != SbxERR_OK )
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 1ecd20cc2b..f89c863e92 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbxvar.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index ba67d5bfa5..acc63fe6b6 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgcont.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/makefile.mk b/basic/source/uno/makefile.mk
index c77ad7a2d5..cd5980c1a3 100644
--- a/basic/source/uno/makefile.mk
+++ b/basic/source/uno/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index 1686ed6403..905b849391 100644
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: modsizeexceeded.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 3ad2332d9a..3788fb30e8 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: namecont.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/sbmodule.cxx b/basic/source/uno/sbmodule.cxx
index 001a2e98d1..db9383a019 100644
--- a/basic/source/uno/sbmodule.cxx
+++ b/basic/source/uno/sbmodule.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbmodule.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx
index d297e9a81f..459dac6918 100644
--- a/basic/source/uno/sbmodule.hxx
+++ b/basic/source/uno/sbmodule.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbmodule.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index a2a4ded10d..7a1a4fd2d1 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbservices.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 2d7d8e8fc2..54c8aa27cc 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptcont.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index 76385e91c1..e6d2ae9455 100644
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.24 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/workben/basmgr.src b/basic/workben/basmgr.src
index 94f406d745..f89c719c23 100644
--- a/basic/workben/basmgr.src
+++ b/basic/workben/basmgr.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmgr.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk
index 9ab482d837..3359a076c3 100644
--- a/basic/workben/makefile.mk
+++ b/basic/workben/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index fb02dda748..56c992b53d 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mgrtest.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
index 5637340c04..92a1ee2c64 100644
--- a/configmgr/inc/makefile.mk
+++ b/configmgr/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/inc/pch/precompiled_configmgr.cxx b/configmgr/inc/pch/precompiled_configmgr.cxx
index 7f5bcb8fb3..fe7de05471 100644
--- a/configmgr/inc/pch/precompiled_configmgr.cxx
+++ b/configmgr/inc/pch/precompiled_configmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_configmgr.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index 114a355290..ee0dcc4ec6 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_configmgr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/makefile.pmk b/configmgr/makefile.pmk
index 0ef67b4369..2d88a07964 100644
--- a/configmgr/makefile.pmk
+++ b/configmgr/makefile.pmk
@@ -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: $
-#
-# $Revision: $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx
index f686a43aac..ace8e98137 100644
--- a/configmgr/qa/unit/common.hxx
+++ b/configmgr/qa/unit/common.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: common.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/data/org/openoffice/Setup.xcu b/configmgr/qa/unit/data/org/openoffice/Setup.xcu
index 28ef05e707..956aacbf4e 100644
--- a/configmgr/qa/unit/data/org/openoffice/Setup.xcu
+++ b/configmgr/qa/unit/data/org/openoffice/Setup.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Setup.xcu,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu b/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu
index 512b759478..25cc7021d6 100644
--- a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu
+++ b/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GenericCommands.xcu,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index a6a79ebdd0..8ae1690fa7 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/qa/unit/performance.cxx b/configmgr/qa/unit/performance.cxx
index 7a3e0475a4..d1c729d334 100644
--- a/configmgr/qa/unit/performance.cxx
+++ b/configmgr/qa/unit/performance.cxx
@@ -4,13 +4,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: performance.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/schema/org/openoffice/Setup.xcs b/configmgr/qa/unit/schema/org/openoffice/Setup.xcs
index f126025b88..47787f2d3a 100644
--- a/configmgr/qa/unit/schema/org/openoffice/Setup.xcs
+++ b/configmgr/qa/unit/schema/org/openoffice/Setup.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Setup.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs b/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs
index b4f1d66758..241fc04d89 100644
--- a/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs
+++ b/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Commands.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs b/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs
index 39edfdce8f..94e3c17297 100644
--- a/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs
+++ b/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GenericCommands.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx
index b04f7c3550..e95a01865f 100644
--- a/configmgr/qa/unit/threading.cxx
+++ b/configmgr/qa/unit/threading.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: threading.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unit/ubootstrap.cxx b/configmgr/qa/unit/ubootstrap.cxx
index 907f05c43b..e0e12c0343 100644
--- a/configmgr/qa/unit/ubootstrap.cxx
+++ b/configmgr/qa/unit/ubootstrap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ubootstrap.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk
index 6be9331b2c..7b5cce1b55 100644
--- a/configmgr/qa/unoapi/makefile.mk
+++ b/configmgr/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/api/confevents.cxx b/configmgr/source/api/confevents.cxx
index b99cd9b1f7..68a76fd7be 100644
--- a/configmgr/source/api/confevents.cxx
+++ b/configmgr/source/api/confevents.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confevents.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api/confsvccomponent.cxx b/configmgr/source/api/confsvccomponent.cxx
index a47cf2a7c1..838eca4204 100644
--- a/configmgr/source/api/confsvccomponent.cxx
+++ b/configmgr/source/api/confsvccomponent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confsvccomponent.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api/makefile.mk b/configmgr/source/api/makefile.mk
index 3d601f5b99..5d719646a3 100644
--- a/configmgr/source/api/makefile.mk
+++ b/configmgr/source/api/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/api2/accessimpl.cxx b/configmgr/source/api2/accessimpl.cxx
index 69098d7c12..d2a788d64c 100644
--- a/configmgr/source/api2/accessimpl.cxx
+++ b/configmgr/source/api2/accessimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessimpl.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/accessimpl.hxx b/configmgr/source/api2/accessimpl.hxx
index b168338b6b..7a32714ff3 100644
--- a/configmgr/source/api2/accessimpl.hxx
+++ b/configmgr/source/api2/accessimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessimpl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apiaccessobj.cxx b/configmgr/source/api2/apiaccessobj.cxx
index d595653359..9e7e0b2a6b 100644
--- a/configmgr/source/api2/apiaccessobj.cxx
+++ b/configmgr/source/api2/apiaccessobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apiaccessobj.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apiaccessobj.hxx b/configmgr/source/api2/apiaccessobj.hxx
index 85832c27aa..95a38ce463 100644
--- a/configmgr/source/api2/apiaccessobj.hxx
+++ b/configmgr/source/api2/apiaccessobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apiaccessobj.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apiaccessobj.inl b/configmgr/source/api2/apiaccessobj.inl
index 1f1eaf2c21..6a1c810599 100644
--- a/configmgr/source/api2/apiaccessobj.inl
+++ b/configmgr/source/api2/apiaccessobj.inl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apiaccessobj.inl,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apifactory.cxx b/configmgr/source/api2/apifactory.cxx
index 418d5ce756..25428c9984 100644
--- a/configmgr/source/api2/apifactory.cxx
+++ b/configmgr/source/api2/apifactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apifactory.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apifactory.hxx b/configmgr/source/api2/apifactory.hxx
index 62b8d41065..ae5eac0267 100644
--- a/configmgr/source/api2/apifactory.hxx
+++ b/configmgr/source/api2/apifactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apifactory.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apifactoryimpl.cxx b/configmgr/source/api2/apifactoryimpl.cxx
index 8a64373153..0b27b0176d 100644
--- a/configmgr/source/api2/apifactoryimpl.cxx
+++ b/configmgr/source/api2/apifactoryimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apifactoryimpl.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apifactoryimpl.hxx b/configmgr/source/api2/apifactoryimpl.hxx
index dc355f5b71..64e2c41421 100644
--- a/configmgr/source/api2/apifactoryimpl.hxx
+++ b/configmgr/source/api2/apifactoryimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apifactoryimpl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apinodeaccess.cxx b/configmgr/source/api2/apinodeaccess.cxx
index c5f9cd0717..afe96ee527 100644
--- a/configmgr/source/api2/apinodeaccess.cxx
+++ b/configmgr/source/api2/apinodeaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apinodeaccess.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apinodeaccess.hxx b/configmgr/source/api2/apinodeaccess.hxx
index c0c80fe386..711758a9b5 100644
--- a/configmgr/source/api2/apinodeaccess.hxx
+++ b/configmgr/source/api2/apinodeaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apinodeaccess.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apinodeupdate.cxx b/configmgr/source/api2/apinodeupdate.cxx
index d7cf1d409c..9efda630a3 100644
--- a/configmgr/source/api2/apinodeupdate.cxx
+++ b/configmgr/source/api2/apinodeupdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apinodeupdate.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apinodeupdate.hxx b/configmgr/source/api2/apinodeupdate.hxx
index bade3975f3..13632638ba 100644
--- a/configmgr/source/api2/apinodeupdate.hxx
+++ b/configmgr/source/api2/apinodeupdate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apinodeupdate.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apinotifierimpl.cxx b/configmgr/source/api2/apinotifierimpl.cxx
index 8dca2a44a0..4727db3bd0 100644
--- a/configmgr/source/api2/apinotifierimpl.cxx
+++ b/configmgr/source/api2/apinotifierimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apinotifierimpl.cxx,v $
- * $Revision: 1.8.20.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apinotifierimpl.hxx b/configmgr/source/api2/apinotifierimpl.hxx
index 4a19118395..fd580b04e4 100644
--- a/configmgr/source/api2/apinotifierimpl.hxx
+++ b/configmgr/source/api2/apinotifierimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apinotifierimpl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apiserviceinfo.cxx b/configmgr/source/api2/apiserviceinfo.cxx
index 21f9db4b8c..118cb266f1 100644
--- a/configmgr/source/api2/apiserviceinfo.cxx
+++ b/configmgr/source/api2/apiserviceinfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apiserviceinfo.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apiserviceinfo.hxx b/configmgr/source/api2/apiserviceinfo.hxx
index c7bef47c43..d222ff3256 100644
--- a/configmgr/source/api2/apiserviceinfo.hxx
+++ b/configmgr/source/api2/apiserviceinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apiserviceinfo.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apitreeaccess.cxx b/configmgr/source/api2/apitreeaccess.cxx
index 14c222618d..c9af80bde2 100644
--- a/configmgr/source/api2/apitreeaccess.cxx
+++ b/configmgr/source/api2/apitreeaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apitreeaccess.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apitreeaccess.hxx b/configmgr/source/api2/apitreeaccess.hxx
index a0d8659c02..f581139c93 100644
--- a/configmgr/source/api2/apitreeaccess.hxx
+++ b/configmgr/source/api2/apitreeaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apitreeaccess.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apitreeimplobj.cxx b/configmgr/source/api2/apitreeimplobj.cxx
index ff0453f17e..6d51909a55 100644
--- a/configmgr/source/api2/apitreeimplobj.cxx
+++ b/configmgr/source/api2/apitreeimplobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apitreeimplobj.cxx,v $
- * $Revision: 1.44 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/apitreeimplobj.hxx b/configmgr/source/api2/apitreeimplobj.hxx
index 087893e817..0e47e43606 100644
--- a/configmgr/source/api2/apitreeimplobj.hxx
+++ b/configmgr/source/api2/apitreeimplobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apitreeimplobj.hxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/broadcaster.cxx b/configmgr/source/api2/broadcaster.cxx
index 71b29177c5..ed0f20d733 100644
--- a/configmgr/source/api2/broadcaster.cxx
+++ b/configmgr/source/api2/broadcaster.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: broadcaster.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/broadcaster.hxx b/configmgr/source/api2/broadcaster.hxx
index 280e894bc2..d41a2172e7 100644
--- a/configmgr/source/api2/broadcaster.hxx
+++ b/configmgr/source/api2/broadcaster.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: broadcaster.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/committer.cxx b/configmgr/source/api2/committer.cxx
index ffbd3bebe6..451f9ffa5f 100644
--- a/configmgr/source/api2/committer.cxx
+++ b/configmgr/source/api2/committer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: committer.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/committer.hxx b/configmgr/source/api2/committer.hxx
index 88011297c3..5ca6809e48 100644
--- a/configmgr/source/api2/committer.hxx
+++ b/configmgr/source/api2/committer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: committer.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/confignotifier.cxx b/configmgr/source/api2/confignotifier.cxx
index 59413e0f4c..0d3d8c91bb 100644
--- a/configmgr/source/api2/confignotifier.cxx
+++ b/configmgr/source/api2/confignotifier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confignotifier.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/confignotifier.hxx b/configmgr/source/api2/confignotifier.hxx
index bd1c121db2..b0387e97e4 100644
--- a/configmgr/source/api2/confignotifier.hxx
+++ b/configmgr/source/api2/confignotifier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confignotifier.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/elementaccess.cxx b/configmgr/source/api2/elementaccess.cxx
index cb497a7a51..8bed198147 100644
--- a/configmgr/source/api2/elementaccess.cxx
+++ b/configmgr/source/api2/elementaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementaccess.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/elementaccess.hxx b/configmgr/source/api2/elementaccess.hxx
index 8bf73774a2..c0d420c2a6 100644
--- a/configmgr/source/api2/elementaccess.hxx
+++ b/configmgr/source/api2/elementaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementaccess.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/elementimpl.cxx b/configmgr/source/api2/elementimpl.cxx
index 1b6dffcbf2..a2a3d6f3d1 100644
--- a/configmgr/source/api2/elementimpl.cxx
+++ b/configmgr/source/api2/elementimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementimpl.cxx,v $
- * $Revision: 1.17.14.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/elementimpl.hxx b/configmgr/source/api2/elementimpl.hxx
index 1fe4e99cfc..8e993514a5 100644
--- a/configmgr/source/api2/elementimpl.hxx
+++ b/configmgr/source/api2/elementimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementimpl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/groupaccess.cxx b/configmgr/source/api2/groupaccess.cxx
index b5e32cca3a..822df83cb9 100644
--- a/configmgr/source/api2/groupaccess.cxx
+++ b/configmgr/source/api2/groupaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupaccess.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/groupaccess.hxx b/configmgr/source/api2/groupaccess.hxx
index 7a6903c0c7..cc92aae13e 100644
--- a/configmgr/source/api2/groupaccess.hxx
+++ b/configmgr/source/api2/groupaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupaccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/groupobjects.cxx b/configmgr/source/api2/groupobjects.cxx
index be1b7bd380..097e3c1ac6 100644
--- a/configmgr/source/api2/groupobjects.cxx
+++ b/configmgr/source/api2/groupobjects.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupobjects.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/groupobjects.hxx b/configmgr/source/api2/groupobjects.hxx
index 321b0a2cff..f6b1976c59 100644
--- a/configmgr/source/api2/groupobjects.hxx
+++ b/configmgr/source/api2/groupobjects.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupobjects.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/groupupdate.cxx b/configmgr/source/api2/groupupdate.cxx
index 15ce940d4d..52690a384b 100644
--- a/configmgr/source/api2/groupupdate.cxx
+++ b/configmgr/source/api2/groupupdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupupdate.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/groupupdate.hxx b/configmgr/source/api2/groupupdate.hxx
index ad85036b7c..51e1b5e4bb 100644
--- a/configmgr/source/api2/groupupdate.hxx
+++ b/configmgr/source/api2/groupupdate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupupdate.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/listenercontainer.cxx b/configmgr/source/api2/listenercontainer.cxx
index 5f54d6f77f..7def11730f 100644
--- a/configmgr/source/api2/listenercontainer.cxx
+++ b/configmgr/source/api2/listenercontainer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: listenercontainer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/listenercontainer.hxx b/configmgr/source/api2/listenercontainer.hxx
index cff7a1ff92..5c314458b2 100644
--- a/configmgr/source/api2/listenercontainer.hxx
+++ b/configmgr/source/api2/listenercontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: listenercontainer.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/makefile.mk b/configmgr/source/api2/makefile.mk
index cb79cf0f3e..a26e284b2e 100644
--- a/configmgr/source/api2/makefile.mk
+++ b/configmgr/source/api2/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/api2/notifierimpl.hxx b/configmgr/source/api2/notifierimpl.hxx
index 445ef00d31..593243508a 100644
--- a/configmgr/source/api2/notifierimpl.hxx
+++ b/configmgr/source/api2/notifierimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: notifierimpl.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/objectregistry.hxx b/configmgr/source/api2/objectregistry.hxx
index 5e28fdad5a..8b2430fcdb 100644
--- a/configmgr/source/api2/objectregistry.hxx
+++ b/configmgr/source/api2/objectregistry.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectregistry.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propertiesfilterednotifier.cxx b/configmgr/source/api2/propertiesfilterednotifier.cxx
index 7e4a13f9b9..baca7ee1c7 100644
--- a/configmgr/source/api2/propertiesfilterednotifier.cxx
+++ b/configmgr/source/api2/propertiesfilterednotifier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertiesfilterednotifier.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propertiesfilterednotifier.hxx b/configmgr/source/api2/propertiesfilterednotifier.hxx
index 235a68e54e..7f5fa39bbc 100644
--- a/configmgr/source/api2/propertiesfilterednotifier.hxx
+++ b/configmgr/source/api2/propertiesfilterednotifier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertiesfilterednotifier.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propertyinfohelper.cxx b/configmgr/source/api2/propertyinfohelper.cxx
index 2b9acdfd94..8bd55946bb 100644
--- a/configmgr/source/api2/propertyinfohelper.cxx
+++ b/configmgr/source/api2/propertyinfohelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyinfohelper.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propertyinfohelper.hxx b/configmgr/source/api2/propertyinfohelper.hxx
index 657ee983cc..92e87afb03 100644
--- a/configmgr/source/api2/propertyinfohelper.hxx
+++ b/configmgr/source/api2/propertyinfohelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyinfohelper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propertysetaccess.cxx b/configmgr/source/api2/propertysetaccess.cxx
index 7a9be49a33..af50cdf5e3 100644
--- a/configmgr/source/api2/propertysetaccess.cxx
+++ b/configmgr/source/api2/propertysetaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysetaccess.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propertysetaccess.hxx b/configmgr/source/api2/propertysetaccess.hxx
index 0cf8d0580f..19fe1f3db1 100644
--- a/configmgr/source/api2/propertysetaccess.hxx
+++ b/configmgr/source/api2/propertysetaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysetaccess.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propsetaccessimpl.cxx b/configmgr/source/api2/propsetaccessimpl.cxx
index be1f571076..dd393f74d0 100644
--- a/configmgr/source/api2/propsetaccessimpl.cxx
+++ b/configmgr/source/api2/propsetaccessimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propsetaccessimpl.cxx,v $
- * $Revision: 1.24.10.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/propsetaccessimpl.hxx b/configmgr/source/api2/propsetaccessimpl.hxx
index 223205c2ec..0c48390c13 100644
--- a/configmgr/source/api2/propsetaccessimpl.hxx
+++ b/configmgr/source/api2/propsetaccessimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propsetaccessimpl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/provider.cxx b/configmgr/source/api2/provider.cxx
index 37043d5705..189e10ec3d 100644
--- a/configmgr/source/api2/provider.cxx
+++ b/configmgr/source/api2/provider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provider.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/provider.hxx b/configmgr/source/api2/provider.hxx
index 916cb0aef8..8c39ef7075 100644
--- a/configmgr/source/api2/provider.hxx
+++ b/configmgr/source/api2/provider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provider.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/providerimpl.cxx b/configmgr/source/api2/providerimpl.cxx
index 03ce8a9278..18f52c428a 100644
--- a/configmgr/source/api2/providerimpl.cxx
+++ b/configmgr/source/api2/providerimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providerimpl.cxx,v $
- * $Revision: 1.69 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/providerimpl.hxx b/configmgr/source/api2/providerimpl.hxx
index 9e8e9e252d..91df1c33b4 100644
--- a/configmgr/source/api2/providerimpl.hxx
+++ b/configmgr/source/api2/providerimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providerimpl.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/setaccess.cxx b/configmgr/source/api2/setaccess.cxx
index c421e6430b..de640f8d25 100644
--- a/configmgr/source/api2/setaccess.cxx
+++ b/configmgr/source/api2/setaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setaccess.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/setaccess.hxx b/configmgr/source/api2/setaccess.hxx
index a8975ff90d..a77d0d1c6b 100644
--- a/configmgr/source/api2/setaccess.hxx
+++ b/configmgr/source/api2/setaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setaccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/setobjects.cxx b/configmgr/source/api2/setobjects.cxx
index 54d1e514c6..433fd50e09 100644
--- a/configmgr/source/api2/setobjects.cxx
+++ b/configmgr/source/api2/setobjects.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setobjects.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/setobjects.hxx b/configmgr/source/api2/setobjects.hxx
index b1272b4e6b..f78653f4db 100644
--- a/configmgr/source/api2/setobjects.hxx
+++ b/configmgr/source/api2/setobjects.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setobjects.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/setupdate.cxx b/configmgr/source/api2/setupdate.cxx
index 2dff6a99f4..55be712b2e 100644
--- a/configmgr/source/api2/setupdate.cxx
+++ b/configmgr/source/api2/setupdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setupdate.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/setupdate.hxx b/configmgr/source/api2/setupdate.hxx
index dd67364eaf..262c7bb27a 100644
--- a/configmgr/source/api2/setupdate.hxx
+++ b/configmgr/source/api2/setupdate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setupdate.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/translatechanges.cxx b/configmgr/source/api2/translatechanges.cxx
index d78c89212b..f51cc23900 100644
--- a/configmgr/source/api2/translatechanges.cxx
+++ b/configmgr/source/api2/translatechanges.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: translatechanges.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/translatechanges.hxx b/configmgr/source/api2/translatechanges.hxx
index 0ebb22aa50..146c0727eb 100644
--- a/configmgr/source/api2/translatechanges.hxx
+++ b/configmgr/source/api2/translatechanges.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: translatechanges.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/treeiterators.cxx b/configmgr/source/api2/treeiterators.cxx
index bb26557b41..588bce07df 100644
--- a/configmgr/source/api2/treeiterators.cxx
+++ b/configmgr/source/api2/treeiterators.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeiterators.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/treeiterators.hxx b/configmgr/source/api2/treeiterators.hxx
index 2656882ae9..57023de799 100644
--- a/configmgr/source/api2/treeiterators.hxx
+++ b/configmgr/source/api2/treeiterators.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeiterators.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/updateimpl.cxx b/configmgr/source/api2/updateimpl.cxx
index 301a9f77c1..71f57df429 100644
--- a/configmgr/source/api2/updateimpl.cxx
+++ b/configmgr/source/api2/updateimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updateimpl.cxx,v $
- * $Revision: 1.15.20.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/api2/updateimpl.hxx b/configmgr/source/api2/updateimpl.hxx
index 77b510f424..3bc8fe4d28 100644
--- a/configmgr/source/api2/updateimpl.hxx
+++ b/configmgr/source/api2/updateimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updateimpl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendaccess.cxx b/configmgr/source/backend/backendaccess.cxx
index c84a4d7e5e..62b065050f 100644
--- a/configmgr/source/backend/backendaccess.cxx
+++ b/configmgr/source/backend/backendaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendaccess.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendaccess.hxx b/configmgr/source/backend/backendaccess.hxx
index 2a53cb7a0f..e6395b37c7 100644
--- a/configmgr/source/backend/backendaccess.hxx
+++ b/configmgr/source/backend/backendaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendaccess.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendfactory.cxx b/configmgr/source/backend/backendfactory.cxx
index eda39e38ef..5f4e93f205 100644
--- a/configmgr/source/backend/backendfactory.cxx
+++ b/configmgr/source/backend/backendfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendfactory.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendnotifier.cxx b/configmgr/source/backend/backendnotifier.cxx
index 2deb007382..ed95eb0aa9 100644
--- a/configmgr/source/backend/backendnotifier.cxx
+++ b/configmgr/source/backend/backendnotifier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendnotifier.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendnotifier.hxx b/configmgr/source/backend/backendnotifier.hxx
index 9ab179832c..18aa43aa41 100644
--- a/configmgr/source/backend/backendnotifier.hxx
+++ b/configmgr/source/backend/backendnotifier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendnotifier.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendstratalistener.cxx b/configmgr/source/backend/backendstratalistener.cxx
index e7de81ca00..e772477895 100644
--- a/configmgr/source/backend/backendstratalistener.cxx
+++ b/configmgr/source/backend/backendstratalistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendstratalistener.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/backendstratalistener.hxx b/configmgr/source/backend/backendstratalistener.hxx
index 72a4b9cc34..c9ac5309d1 100644
--- a/configmgr/source/backend/backendstratalistener.hxx
+++ b/configmgr/source/backend/backendstratalistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendstratalistener.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/basicimporthandler.cxx b/configmgr/source/backend/basicimporthandler.cxx
index 2cbf3cc41b..327c897d14 100644
--- a/configmgr/source/backend/basicimporthandler.cxx
+++ b/configmgr/source/backend/basicimporthandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicimporthandler.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/basicimporthandler.hxx b/configmgr/source/backend/basicimporthandler.hxx
index b62eb0bf3f..828e0d055e 100644
--- a/configmgr/source/backend/basicimporthandler.hxx
+++ b/configmgr/source/backend/basicimporthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicimporthandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/basicupdatemerger.cxx b/configmgr/source/backend/basicupdatemerger.cxx
index 205a062651..d2e8e11931 100644
--- a/configmgr/source/backend/basicupdatemerger.cxx
+++ b/configmgr/source/backend/basicupdatemerger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicupdatemerger.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/basicupdatemerger.hxx b/configmgr/source/backend/basicupdatemerger.hxx
index e4c233f6e1..74882f7a74 100644
--- a/configmgr/source/backend/basicupdatemerger.hxx
+++ b/configmgr/source/backend/basicupdatemerger.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicupdatemerger.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binarycache.cxx b/configmgr/source/backend/binarycache.cxx
index 005e418a0b..e9c14bdb4a 100644
--- a/configmgr/source/backend/binarycache.cxx
+++ b/configmgr/source/backend/binarycache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binarycache.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binarycache.hxx b/configmgr/source/backend/binarycache.hxx
index f4506a12b1..7a49b7d39e 100644
--- a/configmgr/source/backend/binarycache.hxx
+++ b/configmgr/source/backend/binarycache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binarycache.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binaryreader.cxx b/configmgr/source/backend/binaryreader.cxx
index fcf971a8ba..f619ac1664 100644
--- a/configmgr/source/backend/binaryreader.cxx
+++ b/configmgr/source/backend/binaryreader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binaryreader.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binaryreader.hxx b/configmgr/source/backend/binaryreader.hxx
index d299008b58..8fecd88627 100644
--- a/configmgr/source/backend/binaryreader.hxx
+++ b/configmgr/source/backend/binaryreader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binaryreader.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binaryreadhandler.cxx b/configmgr/source/backend/binaryreadhandler.cxx
index eefca28952..0488d220b1 100644
--- a/configmgr/source/backend/binaryreadhandler.cxx
+++ b/configmgr/source/backend/binaryreadhandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binaryreadhandler.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binaryreadhandler.hxx b/configmgr/source/backend/binaryreadhandler.hxx
index 7a7e75a607..0a4ab848e1 100644
--- a/configmgr/source/backend/binaryreadhandler.hxx
+++ b/configmgr/source/backend/binaryreadhandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binaryreadhandler.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binarywritehandler.cxx b/configmgr/source/backend/binarywritehandler.cxx
index bb168cb8a4..1e60ad5ba0 100644
--- a/configmgr/source/backend/binarywritehandler.cxx
+++ b/configmgr/source/backend/binarywritehandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binarywritehandler.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binarywritehandler.hxx b/configmgr/source/backend/binarywritehandler.hxx
index 366b4c78df..9c85ac0575 100644
--- a/configmgr/source/backend/binarywritehandler.hxx
+++ b/configmgr/source/backend/binarywritehandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binarywritehandler.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binarywriter.cxx b/configmgr/source/backend/binarywriter.cxx
index fafe25f3f1..126a7d54f0 100644
--- a/configmgr/source/backend/binarywriter.cxx
+++ b/configmgr/source/backend/binarywriter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binarywriter.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/binarywriter.hxx b/configmgr/source/backend/binarywriter.hxx
index 58c11b82c9..a172551429 100644
--- a/configmgr/source/backend/binarywriter.hxx
+++ b/configmgr/source/backend/binarywriter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: binarywriter.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/componentdatahelper.cxx b/configmgr/source/backend/componentdatahelper.cxx
index 0007ac1bb7..dff3a3a7e2 100644
--- a/configmgr/source/backend/componentdatahelper.cxx
+++ b/configmgr/source/backend/componentdatahelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: componentdatahelper.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/componentdatahelper.hxx b/configmgr/source/backend/componentdatahelper.hxx
index f482274fca..e4f78977dd 100644
--- a/configmgr/source/backend/componentdatahelper.hxx
+++ b/configmgr/source/backend/componentdatahelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: componentdatahelper.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/emptylayer.cxx b/configmgr/source/backend/emptylayer.cxx
index bd174556ee..5a0b243ba8 100644
--- a/configmgr/source/backend/emptylayer.cxx
+++ b/configmgr/source/backend/emptylayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: emptylayer.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/emptylayerimpl.hxx b/configmgr/source/backend/emptylayerimpl.hxx
index 3c57face40..715ed79fb8 100644
--- a/configmgr/source/backend/emptylayerimpl.hxx
+++ b/configmgr/source/backend/emptylayerimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: emptylayerimpl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/importmergehandler.cxx b/configmgr/source/backend/importmergehandler.cxx
index df863cbc88..7bce0741cd 100644
--- a/configmgr/source/backend/importmergehandler.cxx
+++ b/configmgr/source/backend/importmergehandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: importmergehandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/importmergehandler.hxx b/configmgr/source/backend/importmergehandler.hxx
index 8e0983856c..e7df33d603 100644
--- a/configmgr/source/backend/importmergehandler.hxx
+++ b/configmgr/source/backend/importmergehandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: importmergehandler.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/importsvc.cxx b/configmgr/source/backend/importsvc.cxx
index 0e20097e1e..f828913cc3 100644
--- a/configmgr/source/backend/importsvc.cxx
+++ b/configmgr/source/backend/importsvc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: importsvc.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/importsvc.hxx b/configmgr/source/backend/importsvc.hxx
index a539882097..3ccd9666c9 100644
--- a/configmgr/source/backend/importsvc.hxx
+++ b/configmgr/source/backend/importsvc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: importsvc.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerdefaultremover.cxx b/configmgr/source/backend/layerdefaultremover.cxx
index 6cfe71a9d6..4b719cdd63 100644
--- a/configmgr/source/backend/layerdefaultremover.cxx
+++ b/configmgr/source/backend/layerdefaultremover.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerdefaultremover.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerdefaultremover.hxx b/configmgr/source/backend/layerdefaultremover.hxx
index 784b7f7a53..3ae25b3c80 100644
--- a/configmgr/source/backend/layerdefaultremover.hxx
+++ b/configmgr/source/backend/layerdefaultremover.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerdefaultremover.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layermerge.cxx b/configmgr/source/backend/layermerge.cxx
index 05c11577ea..55884da13e 100644
--- a/configmgr/source/backend/layermerge.cxx
+++ b/configmgr/source/backend/layermerge.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layermerge.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layermerge.hxx b/configmgr/source/backend/layermerge.hxx
index c21e5d1a91..4bc715cf75 100644
--- a/configmgr/source/backend/layermerge.hxx
+++ b/configmgr/source/backend/layermerge.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layermerge.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdate.cxx b/configmgr/source/backend/layerupdate.cxx
index 8bbb401b39..6247e7b23a 100644
--- a/configmgr/source/backend/layerupdate.cxx
+++ b/configmgr/source/backend/layerupdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdate.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdate.hxx b/configmgr/source/backend/layerupdate.hxx
index dfedfa9b5a..187065ee90 100644
--- a/configmgr/source/backend/layerupdate.hxx
+++ b/configmgr/source/backend/layerupdate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdate.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdatebuilder.cxx b/configmgr/source/backend/layerupdatebuilder.cxx
index a461316096..9c5c2730fe 100644
--- a/configmgr/source/backend/layerupdatebuilder.cxx
+++ b/configmgr/source/backend/layerupdatebuilder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdatebuilder.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdatebuilder.hxx b/configmgr/source/backend/layerupdatebuilder.hxx
index 47e4b38612..ac956b68e2 100644
--- a/configmgr/source/backend/layerupdatebuilder.hxx
+++ b/configmgr/source/backend/layerupdatebuilder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdatebuilder.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdatehandler.cxx b/configmgr/source/backend/layerupdatehandler.cxx
index 99ffd0db88..62114cb2e8 100644
--- a/configmgr/source/backend/layerupdatehandler.cxx
+++ b/configmgr/source/backend/layerupdatehandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdatehandler.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdatehandler.hxx b/configmgr/source/backend/layerupdatehandler.hxx
index 93bd4a30e5..89074c6444 100644
--- a/configmgr/source/backend/layerupdatehandler.hxx
+++ b/configmgr/source/backend/layerupdatehandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdatehandler.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdatemerger.cxx b/configmgr/source/backend/layerupdatemerger.cxx
index c6bfcfc7f1..d09b9ee4d2 100644
--- a/configmgr/source/backend/layerupdatemerger.cxx
+++ b/configmgr/source/backend/layerupdatemerger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdatemerger.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/layerupdatemerger.hxx b/configmgr/source/backend/layerupdatemerger.hxx
index 751c5b7274..81809dfe2a 100644
--- a/configmgr/source/backend/layerupdatemerger.hxx
+++ b/configmgr/source/backend/layerupdatemerger.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerupdatemerger.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/makefile.mk b/configmgr/source/backend/makefile.mk
index 97e372929f..e1e726c977 100644
--- a/configmgr/source/backend/makefile.mk
+++ b/configmgr/source/backend/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/backend/mergedcomponentdata.cxx b/configmgr/source/backend/mergedcomponentdata.cxx
index bc3604fd0f..afb670d89d 100644
--- a/configmgr/source/backend/mergedcomponentdata.cxx
+++ b/configmgr/source/backend/mergedcomponentdata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mergedcomponentdata.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/mergedcomponentdata.hxx b/configmgr/source/backend/mergedcomponentdata.hxx
index 6cda735aea..099e426881 100644
--- a/configmgr/source/backend/mergedcomponentdata.hxx
+++ b/configmgr/source/backend/mergedcomponentdata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mergedcomponentdata.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/multistratumbackend.cxx b/configmgr/source/backend/multistratumbackend.cxx
index 3bc3169a32..7954097bf0 100644
--- a/configmgr/source/backend/multistratumbackend.cxx
+++ b/configmgr/source/backend/multistratumbackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multistratumbackend.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/multistratumbackend.hxx b/configmgr/source/backend/multistratumbackend.hxx
index 00865ea664..e1b80ed9c9 100644
--- a/configmgr/source/backend/multistratumbackend.hxx
+++ b/configmgr/source/backend/multistratumbackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multistratumbackend.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/schemabuilder.cxx b/configmgr/source/backend/schemabuilder.cxx
index 0956119e85..6c192f9976 100644
--- a/configmgr/source/backend/schemabuilder.cxx
+++ b/configmgr/source/backend/schemabuilder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: schemabuilder.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/schemabuilder.hxx b/configmgr/source/backend/schemabuilder.hxx
index 4fc42c377e..18826f6a2c 100644
--- a/configmgr/source/backend/schemabuilder.hxx
+++ b/configmgr/source/backend/schemabuilder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: schemabuilder.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/singlebackendadapter.cxx b/configmgr/source/backend/singlebackendadapter.cxx
index bcecbe7e5b..55cfa78af7 100644
--- a/configmgr/source/backend/singlebackendadapter.cxx
+++ b/configmgr/source/backend/singlebackendadapter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: singlebackendadapter.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/singlebackendadapter.hxx b/configmgr/source/backend/singlebackendadapter.hxx
index 5790f27dd8..d164610682 100644
--- a/configmgr/source/backend/singlebackendadapter.hxx
+++ b/configmgr/source/backend/singlebackendadapter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: singlebackendadapter.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/updatedata.cxx b/configmgr/source/backend/updatedata.cxx
index 0f15d1a894..373ee84d8b 100644
--- a/configmgr/source/backend/updatedata.cxx
+++ b/configmgr/source/backend/updatedata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatedata.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/updatedata.hxx b/configmgr/source/backend/updatedata.hxx
index e3785e3781..e1e0fba5e9 100644
--- a/configmgr/source/backend/updatedata.hxx
+++ b/configmgr/source/backend/updatedata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatedata.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/updatedispatch.cxx b/configmgr/source/backend/updatedispatch.cxx
index d4c44846cc..032bcc46e1 100644
--- a/configmgr/source/backend/updatedispatch.cxx
+++ b/configmgr/source/backend/updatedispatch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatedispatch.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/updatedispatch.hxx b/configmgr/source/backend/updatedispatch.hxx
index 642f8e1a9c..83f9664b5b 100644
--- a/configmgr/source/backend/updatedispatch.hxx
+++ b/configmgr/source/backend/updatedispatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatedispatch.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/updatesvc.cxx b/configmgr/source/backend/updatesvc.cxx
index ed042dc37d..a4dc2f33a7 100644
--- a/configmgr/source/backend/updatesvc.cxx
+++ b/configmgr/source/backend/updatesvc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatesvc.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backend/updatesvc.hxx b/configmgr/source/backend/updatesvc.hxx
index cf40e25e5f..eb2e89d452 100644
--- a/configmgr/source/backend/updatesvc.hxx
+++ b/configmgr/source/backend/updatesvc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatesvc.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backendhelper/backendlayerhelper.cxx b/configmgr/source/backendhelper/backendlayerhelper.cxx
index f58f187ecb..e2eafb1aac 100644
--- a/configmgr/source/backendhelper/backendlayerhelper.cxx
+++ b/configmgr/source/backendhelper/backendlayerhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendlayerhelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backendhelper/backendlayerhelper.hxx b/configmgr/source/backendhelper/backendlayerhelper.hxx
index 785293d147..01d6a28dbd 100644
--- a/configmgr/source/backendhelper/backendlayerhelper.hxx
+++ b/configmgr/source/backendhelper/backendlayerhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendlayerhelper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backendhelper/componentdf.cxx b/configmgr/source/backendhelper/componentdf.cxx
index 137a112099..ea6f2b5b65 100644
--- a/configmgr/source/backendhelper/componentdf.cxx
+++ b/configmgr/source/backendhelper/componentdf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: componentdf.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/backendhelper/makefile.mk b/configmgr/source/backendhelper/makefile.mk
index f9a27c8167..b55c94fa7d 100644
--- a/configmgr/source/backendhelper/makefile.mk
+++ b/configmgr/source/backendhelper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/data/anydata.cxx b/configmgr/source/data/anydata.cxx
index e92b59faf3..68fa57d2fb 100644
--- a/configmgr/source/data/anydata.cxx
+++ b/configmgr/source/data/anydata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: anydata.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/data/makefile.mk b/configmgr/source/data/makefile.mk
index 5745979c1b..0d37b1e2d0 100644
--- a/configmgr/source/data/makefile.mk
+++ b/configmgr/source/data/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/data/sequence.cxx b/configmgr/source/data/sequence.cxx
index dfcd4c39b8..54160ccf1d 100644
--- a/configmgr/source/data/sequence.cxx
+++ b/configmgr/source/data/sequence.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sequence.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/anydata.hxx b/configmgr/source/inc/anydata.hxx
index cc971949ff..f7defba858 100644
--- a/configmgr/source/inc/anydata.hxx
+++ b/configmgr/source/inc/anydata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: anydata.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/anynoderef.hxx b/configmgr/source/inc/anynoderef.hxx
index 29683dad19..38d78edd13 100644
--- a/configmgr/source/inc/anynoderef.hxx
+++ b/configmgr/source/inc/anynoderef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: anynoderef.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/apitypes.hxx b/configmgr/source/inc/apitypes.hxx
index a6518d86f8..122c7d07fb 100644
--- a/configmgr/source/inc/apitypes.hxx
+++ b/configmgr/source/inc/apitypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: apitypes.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/attributes.hxx b/configmgr/source/inc/attributes.hxx
index ca5b18be48..325d8eb087 100644
--- a/configmgr/source/inc/attributes.hxx
+++ b/configmgr/source/inc/attributes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attributes.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/autoobject.hxx b/configmgr/source/inc/autoobject.hxx
index f3b459a716..0d59814d9c 100644
--- a/configmgr/source/inc/autoobject.hxx
+++ b/configmgr/source/inc/autoobject.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autoobject.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/autoreferencemap.hxx b/configmgr/source/inc/autoreferencemap.hxx
index 220ca2257b..2cc9e92961 100644
--- a/configmgr/source/inc/autoreferencemap.hxx
+++ b/configmgr/source/inc/autoreferencemap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autoreferencemap.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/backendfactory.hxx b/configmgr/source/inc/backendfactory.hxx
index 82b6cccdb0..65e8df1eba 100644
--- a/configmgr/source/inc/backendfactory.hxx
+++ b/configmgr/source/inc/backendfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backendfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/bootstrap.hxx b/configmgr/source/inc/bootstrap.hxx
index 8443003852..6cdbfb466f 100644
--- a/configmgr/source/inc/bootstrap.hxx
+++ b/configmgr/source/inc/bootstrap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bootstrap.hxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/bootstrapcontext.hxx b/configmgr/source/inc/bootstrapcontext.hxx
index 5b54e86ab6..cfce655fad 100644
--- a/configmgr/source/inc/bootstrapcontext.hxx
+++ b/configmgr/source/inc/bootstrapcontext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bootstrapcontext.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/bufferedfile.hxx b/configmgr/source/inc/bufferedfile.hxx
index a49fbce6f2..de2859d79b 100644
--- a/configmgr/source/inc/bufferedfile.hxx
+++ b/configmgr/source/inc/bufferedfile.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bufferedfile.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/builddata.hxx b/configmgr/source/inc/builddata.hxx
index 232aec06a4..0fe80ee949 100644
--- a/configmgr/source/inc/builddata.hxx
+++ b/configmgr/source/inc/builddata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: builddata.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/cachefactory.hxx b/configmgr/source/inc/cachefactory.hxx
index 7d4c4c7ba4..b9c0df8d45 100644
--- a/configmgr/source/inc/cachefactory.hxx
+++ b/configmgr/source/inc/cachefactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachefactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/change.hxx b/configmgr/source/inc/change.hxx
index 00f8d01cbc..84ff1b51a0 100644
--- a/configmgr/source/inc/change.hxx
+++ b/configmgr/source/inc/change.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: change.hxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/confapifactory.hxx b/configmgr/source/inc/confapifactory.hxx
index 1ca7f09818..4ef844929c 100644
--- a/configmgr/source/inc/confapifactory.hxx
+++ b/configmgr/source/inc/confapifactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confapifactory.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/confevents.hxx b/configmgr/source/inc/confevents.hxx
index 6b1376213a..6e4d63bbd8 100644
--- a/configmgr/source/inc/confevents.hxx
+++ b/configmgr/source/inc/confevents.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confevents.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/configdefaultprovider.hxx b/configmgr/source/inc/configdefaultprovider.hxx
index c8eff20009..45f45f0da2 100644
--- a/configmgr/source/inc/configdefaultprovider.hxx
+++ b/configmgr/source/inc/configdefaultprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configdefaultprovider.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/configexcept.hxx b/configmgr/source/inc/configexcept.hxx
index c9fa1c0f38..9cc24a843c 100644
--- a/configmgr/source/inc/configexcept.hxx
+++ b/configmgr/source/inc/configexcept.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configexcept.hxx,v $
- * $Revision: 1.6.10.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/configgroup.hxx b/configmgr/source/inc/configgroup.hxx
index c9fd42f732..182798899c 100644
--- a/configmgr/source/inc/configgroup.hxx
+++ b/configmgr/source/inc/configgroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configgroup.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/configinteractionhandler.hxx b/configmgr/source/inc/configinteractionhandler.hxx
index 6b1d3f2b36..5fb881f4dd 100644
--- a/configmgr/source/inc/configinteractionhandler.hxx
+++ b/configmgr/source/inc/configinteractionhandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configinteractionhandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/configpath.hxx b/configmgr/source/inc/configpath.hxx
index 05b09337f8..48b7fb5e14 100644
--- a/configmgr/source/inc/configpath.hxx
+++ b/configmgr/source/inc/configpath.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configpath.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/configset.hxx b/configmgr/source/inc/configset.hxx
index 62651a963f..c1b1a8226d 100644
--- a/configmgr/source/inc/configset.hxx
+++ b/configmgr/source/inc/configset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configset.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/confsvccomponent.hxx b/configmgr/source/inc/confsvccomponent.hxx
index 237f3a6f1f..68b7e284d9 100644
--- a/configmgr/source/inc/confsvccomponent.hxx
+++ b/configmgr/source/inc/confsvccomponent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confsvccomponent.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/datalock.hxx b/configmgr/source/inc/datalock.hxx
index b86166139f..a2a739974e 100644
--- a/configmgr/source/inc/datalock.hxx
+++ b/configmgr/source/inc/datalock.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datalock.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/defaultprovider.hxx b/configmgr/source/inc/defaultprovider.hxx
index 8137b2ffe3..772a026813 100644
--- a/configmgr/source/inc/defaultprovider.hxx
+++ b/configmgr/source/inc/defaultprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defaultprovider.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/emptylayer.hxx b/configmgr/source/inc/emptylayer.hxx
index dc22dc2289..9695eaca71 100644
--- a/configmgr/source/inc/emptylayer.hxx
+++ b/configmgr/source/inc/emptylayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: emptylayer.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/filehelper.hxx b/configmgr/source/inc/filehelper.hxx
index 30677ed511..2a5338e4ba 100644
--- a/configmgr/source/inc/filehelper.hxx
+++ b/configmgr/source/inc/filehelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filehelper.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/flags.hxx b/configmgr/source/inc/flags.hxx
index 1f39166d30..e729c8921a 100644
--- a/configmgr/source/inc/flags.hxx
+++ b/configmgr/source/inc/flags.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: flags.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/interactionrequest.hxx b/configmgr/source/inc/interactionrequest.hxx
index 46fa906260..7ab965afff 100644
--- a/configmgr/source/inc/interactionrequest.hxx
+++ b/configmgr/source/inc/interactionrequest.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interactionrequest.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/localizedtreeactions.hxx b/configmgr/source/inc/localizedtreeactions.hxx
index 94fbb2c067..7a4b7a229b 100644
--- a/configmgr/source/inc/localizedtreeactions.hxx
+++ b/configmgr/source/inc/localizedtreeactions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localizedtreeactions.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/logger.hxx b/configmgr/source/inc/logger.hxx
index 9eb103ca1d..def5958559 100644
--- a/configmgr/source/inc/logger.hxx
+++ b/configmgr/source/inc/logger.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logger.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/matchlocale.hxx b/configmgr/source/inc/matchlocale.hxx
index c6b87c5d3f..6d871a704c 100644
--- a/configmgr/source/inc/matchlocale.hxx
+++ b/configmgr/source/inc/matchlocale.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: matchlocale.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/mergechange.hxx b/configmgr/source/inc/mergechange.hxx
index fd2554a56b..53e5ab7da3 100644
--- a/configmgr/source/inc/mergechange.hxx
+++ b/configmgr/source/inc/mergechange.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mergechange.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/mergeddataprovider.hxx b/configmgr/source/inc/mergeddataprovider.hxx
index e8378a85e1..4f3823343b 100644
--- a/configmgr/source/inc/mergeddataprovider.hxx
+++ b/configmgr/source/inc/mergeddataprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mergeddataprovider.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/namecreator.hxx b/configmgr/source/inc/namecreator.hxx
index e33e64b02e..257c2fa61a 100644
--- a/configmgr/source/inc/namecreator.hxx
+++ b/configmgr/source/inc/namecreator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: namecreator.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/node.hxx b/configmgr/source/inc/node.hxx
index 92d7494c5c..5e872f4a1d 100644
--- a/configmgr/source/inc/node.hxx
+++ b/configmgr/source/inc/node.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: node.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/nodechange.hxx b/configmgr/source/inc/nodechange.hxx
index 30536d85d0..29627f3624 100644
--- a/configmgr/source/inc/nodechange.hxx
+++ b/configmgr/source/inc/nodechange.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodechange.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/nodechangeinfo.hxx b/configmgr/source/inc/nodechangeinfo.hxx
index 840f13ef83..d60d8300c3 100644
--- a/configmgr/source/inc/nodechangeinfo.hxx
+++ b/configmgr/source/inc/nodechangeinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodechangeinfo.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/nodeconverter.hxx b/configmgr/source/inc/nodeconverter.hxx
index 1475b66681..3592c1775f 100644
--- a/configmgr/source/inc/nodeconverter.hxx
+++ b/configmgr/source/inc/nodeconverter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodeconverter.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/noderef.hxx b/configmgr/source/inc/noderef.hxx
index 78cee2868e..4b72bc4efa 100644
--- a/configmgr/source/inc/noderef.hxx
+++ b/configmgr/source/inc/noderef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: noderef.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/nodevisitor.hxx b/configmgr/source/inc/nodevisitor.hxx
index a61b48f9ed..9578a59067 100644
--- a/configmgr/source/inc/nodevisitor.hxx
+++ b/configmgr/source/inc/nodevisitor.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: nodevisitor.hxx,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/configmgr/source/inc/options.hxx b/configmgr/source/inc/options.hxx
index 6ec446df7e..a78cd7d51a 100644
--- a/configmgr/source/inc/options.hxx
+++ b/configmgr/source/inc/options.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: options.hxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/oslstream.hxx b/configmgr/source/inc/oslstream.hxx
index 4ea8868b63..5d02d520d5 100644
--- a/configmgr/source/inc/oslstream.hxx
+++ b/configmgr/source/inc/oslstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oslstream.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/propertysethelper.hxx b/configmgr/source/inc/propertysethelper.hxx
index 201e120320..a836ba00c4 100644
--- a/configmgr/source/inc/propertysethelper.hxx
+++ b/configmgr/source/inc/propertysethelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysethelper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/request.hxx b/configmgr/source/inc/request.hxx
index 1d553abb5c..948aaa0677 100644
--- a/configmgr/source/inc/request.hxx
+++ b/configmgr/source/inc/request.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: request.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/requestoptions.hxx b/configmgr/source/inc/requestoptions.hxx
index bf3ba310cc..7872e6b88a 100644
--- a/configmgr/source/inc/requestoptions.hxx
+++ b/configmgr/source/inc/requestoptions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: requestoptions.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/requesttypes.hxx b/configmgr/source/inc/requesttypes.hxx
index 9fb6d8ac7e..74e31de344 100644
--- a/configmgr/source/inc/requesttypes.hxx
+++ b/configmgr/source/inc/requesttypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: requesttypes.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/roottree.hxx b/configmgr/source/inc/roottree.hxx
index 7e6cee11dc..69bbc0b3e6 100644
--- a/configmgr/source/inc/roottree.hxx
+++ b/configmgr/source/inc/roottree.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: roottree.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/sequence.hxx b/configmgr/source/inc/sequence.hxx
index 2b3702c062..c6195299a0 100644
--- a/configmgr/source/inc/sequence.hxx
+++ b/configmgr/source/inc/sequence.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sequence.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/serviceinfohelper.hxx b/configmgr/source/inc/serviceinfohelper.hxx
index 1be7b1e2a2..25519aa26a 100644
--- a/configmgr/source/inc/serviceinfohelper.hxx
+++ b/configmgr/source/inc/serviceinfohelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: serviceinfohelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/simpleinteractionrequest.hxx b/configmgr/source/inc/simpleinteractionrequest.hxx
index 852216ff88..5257b1ccc0 100644
--- a/configmgr/source/inc/simpleinteractionrequest.hxx
+++ b/configmgr/source/inc/simpleinteractionrequest.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpleinteractionrequest.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/simpletypehelper.hxx b/configmgr/source/inc/simpletypehelper.hxx
index 3c3f75f1a3..69d1b845f1 100644
--- a/configmgr/source/inc/simpletypehelper.hxx
+++ b/configmgr/source/inc/simpletypehelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletypehelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/stack.hxx b/configmgr/source/inc/stack.hxx
index 0208e489b5..164abb8818 100644
--- a/configmgr/source/inc/stack.hxx
+++ b/configmgr/source/inc/stack.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stack.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/strdecl.hxx b/configmgr/source/inc/strdecl.hxx
index 03a5e74bea..fbd4b36e06 100644
--- a/configmgr/source/inc/strdecl.hxx
+++ b/configmgr/source/inc/strdecl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strdecl.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/strings.hxx b/configmgr/source/inc/strings.hxx
index 238eb1de93..0bf6cb74fe 100644
--- a/configmgr/source/inc/strings.hxx
+++ b/configmgr/source/inc/strings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strings.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/template.hxx b/configmgr/source/inc/template.hxx
index 49fea66201..0123cdd62a 100644
--- a/configmgr/source/inc/template.hxx
+++ b/configmgr/source/inc/template.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: template.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/tracer.hxx b/configmgr/source/inc/tracer.hxx
index fe890d97f5..d84d1f0df7 100644
--- a/configmgr/source/inc/tracer.hxx
+++ b/configmgr/source/inc/tracer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tracer.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/tree.hxx b/configmgr/source/inc/tree.hxx
index f9675be2b3..32a6e01ce8 100644
--- a/configmgr/source/inc/tree.hxx
+++ b/configmgr/source/inc/tree.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treeactions.hxx b/configmgr/source/inc/treeactions.hxx
index 7d60b78562..06111cb7bc 100644
--- a/configmgr/source/inc/treeactions.hxx
+++ b/configmgr/source/inc/treeactions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeactions.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treechangefactory.hxx b/configmgr/source/inc/treechangefactory.hxx
index 93a33c0b0d..1fb8c4359c 100644
--- a/configmgr/source/inc/treechangefactory.hxx
+++ b/configmgr/source/inc/treechangefactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treechangefactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treechangelist.hxx b/configmgr/source/inc/treechangelist.hxx
index 5d291cb5f2..1a153a30e8 100644
--- a/configmgr/source/inc/treechangelist.hxx
+++ b/configmgr/source/inc/treechangelist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treechangelist.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treefragment.hxx b/configmgr/source/inc/treefragment.hxx
index 2430c3b7ab..5e247a98a0 100644
--- a/configmgr/source/inc/treefragment.hxx
+++ b/configmgr/source/inc/treefragment.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treefragment.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treemanager.hxx b/configmgr/source/inc/treemanager.hxx
index b261f4e43e..a178afddc0 100644
--- a/configmgr/source/inc/treemanager.hxx
+++ b/configmgr/source/inc/treemanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treemanager.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treenodefactory.hxx b/configmgr/source/inc/treenodefactory.hxx
index 06d8791587..0a016cbb53 100644
--- a/configmgr/source/inc/treenodefactory.hxx
+++ b/configmgr/source/inc/treenodefactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treenodefactory.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/treesegment.hxx b/configmgr/source/inc/treesegment.hxx
index ca8769c82a..badea86541 100644
--- a/configmgr/source/inc/treesegment.hxx
+++ b/configmgr/source/inc/treesegment.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: treesegment.hxx,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/configmgr/source/inc/typeconverter.hxx b/configmgr/source/inc/typeconverter.hxx
index a4d0b1505d..381a1039a4 100644
--- a/configmgr/source/inc/typeconverter.hxx
+++ b/configmgr/source/inc/typeconverter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: typeconverter.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/updatehelper.hxx b/configmgr/source/inc/updatehelper.hxx
index 24bc378167..0d53078d4f 100644
--- a/configmgr/source/inc/updatehelper.hxx
+++ b/configmgr/source/inc/updatehelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatehelper.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/utility.hxx b/configmgr/source/inc/utility.hxx
index 8549747040..664015459e 100644
--- a/configmgr/source/inc/utility.hxx
+++ b/configmgr/source/inc/utility.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: utility.hxx,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/configmgr/source/inc/valuenode.hxx b/configmgr/source/inc/valuenode.hxx
index b2645b504c..3e218c4a88 100644
--- a/configmgr/source/inc/valuenode.hxx
+++ b/configmgr/source/inc/valuenode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valuenode.hxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/valueref.hxx b/configmgr/source/inc/valueref.hxx
index 3973586896..01554af61d 100644
--- a/configmgr/source/inc/valueref.hxx
+++ b/configmgr/source/inc/valueref.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valueref.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/valuetypeconverter.hxx b/configmgr/source/inc/valuetypeconverter.hxx
index 097f1a6c3f..3e1e50bf70 100644
--- a/configmgr/source/inc/valuetypeconverter.hxx
+++ b/configmgr/source/inc/valuetypeconverter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valuetypeconverter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/inc/wrapexception.hxx b/configmgr/source/inc/wrapexception.hxx
index 39aba0e419..c942a21902 100644
--- a/configmgr/source/inc/wrapexception.hxx
+++ b/configmgr/source/inc/wrapexception.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrapexception.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localdataimportsvc.cxx b/configmgr/source/localbe/localdataimportsvc.cxx
index a06472a589..3fa049040e 100644
--- a/configmgr/source/localbe/localdataimportsvc.cxx
+++ b/configmgr/source/localbe/localdataimportsvc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localdataimportsvc.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localdataimportsvc.hxx b/configmgr/source/localbe/localdataimportsvc.hxx
index 187e6703e4..38f2efabc7 100644
--- a/configmgr/source/localbe/localdataimportsvc.hxx
+++ b/configmgr/source/localbe/localdataimportsvc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localdataimportsvc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localfilehelper.cxx b/configmgr/source/localbe/localfilehelper.cxx
index 6d8e9762c0..0648293b8e 100644
--- a/configmgr/source/localbe/localfilehelper.cxx
+++ b/configmgr/source/localbe/localfilehelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localfilehelper.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localfilelayer.cxx b/configmgr/source/localbe/localfilelayer.cxx
index f3470c5f77..8b7ddd2808 100644
--- a/configmgr/source/localbe/localfilelayer.cxx
+++ b/configmgr/source/localbe/localfilelayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localfilelayer.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localfilelayer.hxx b/configmgr/source/localbe/localfilelayer.hxx
index 64cd208030..920487db1b 100644
--- a/configmgr/source/localbe/localfilelayer.hxx
+++ b/configmgr/source/localbe/localfilelayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localfilelayer.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localhierarchybrowsersvc.cxx b/configmgr/source/localbe/localhierarchybrowsersvc.cxx
index 65e9bf8bef..572d6f83cb 100644
--- a/configmgr/source/localbe/localhierarchybrowsersvc.cxx
+++ b/configmgr/source/localbe/localhierarchybrowsersvc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localhierarchybrowsersvc.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localhierarchybrowsersvc.hxx b/configmgr/source/localbe/localhierarchybrowsersvc.hxx
index 478dc6c635..735fe2b05b 100644
--- a/configmgr/source/localbe/localhierarchybrowsersvc.hxx
+++ b/configmgr/source/localbe/localhierarchybrowsersvc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localhierarchybrowsersvc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localmultistratum.cxx b/configmgr/source/localbe/localmultistratum.cxx
index 34700c0d40..f2df7f1eeb 100644
--- a/configmgr/source/localbe/localmultistratum.cxx
+++ b/configmgr/source/localbe/localmultistratum.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localmultistratum.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localmultistratum.hxx b/configmgr/source/localbe/localmultistratum.hxx
index 34c2235e12..fecc8d1720 100644
--- a/configmgr/source/localbe/localmultistratum.hxx
+++ b/configmgr/source/localbe/localmultistratum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localmultistratum.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localoutputstream.cxx b/configmgr/source/localbe/localoutputstream.cxx
index e0dabfa66b..707fecc9d6 100644
--- a/configmgr/source/localbe/localoutputstream.cxx
+++ b/configmgr/source/localbe/localoutputstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localoutputstream.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localoutputstream.hxx b/configmgr/source/localbe/localoutputstream.hxx
index 911e339fbd..d65241d1f9 100644
--- a/configmgr/source/localbe/localoutputstream.hxx
+++ b/configmgr/source/localbe/localoutputstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localoutputstream.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localschemasupplier.cxx b/configmgr/source/localbe/localschemasupplier.cxx
index 8dda0e0d99..f752850465 100644
--- a/configmgr/source/localbe/localschemasupplier.cxx
+++ b/configmgr/source/localbe/localschemasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localschemasupplier.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localschemasupplier.hxx b/configmgr/source/localbe/localschemasupplier.hxx
index 2025c1c3d6..44b4835440 100644
--- a/configmgr/source/localbe/localschemasupplier.hxx
+++ b/configmgr/source/localbe/localschemasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localschemasupplier.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localsinglebackend.cxx b/configmgr/source/localbe/localsinglebackend.cxx
index ca424fce8d..8459f29006 100644
--- a/configmgr/source/localbe/localsinglebackend.cxx
+++ b/configmgr/source/localbe/localsinglebackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localsinglebackend.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localsinglebackend.hxx b/configmgr/source/localbe/localsinglebackend.hxx
index f85ccf6007..b0f31c43d6 100644
--- a/configmgr/source/localbe/localsinglebackend.hxx
+++ b/configmgr/source/localbe/localsinglebackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localsinglebackend.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localsinglestratum.cxx b/configmgr/source/localbe/localsinglestratum.cxx
index 08786e3391..2761b736db 100644
--- a/configmgr/source/localbe/localsinglestratum.cxx
+++ b/configmgr/source/localbe/localsinglestratum.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localsinglestratum.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localsinglestratum.hxx b/configmgr/source/localbe/localsinglestratum.hxx
index 90285d42c5..528cca93d6 100644
--- a/configmgr/source/localbe/localsinglestratum.hxx
+++ b/configmgr/source/localbe/localsinglestratum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localsinglestratum.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localstratumbase.cxx b/configmgr/source/localbe/localstratumbase.cxx
index c57af960da..a66b1a6b82 100644
--- a/configmgr/source/localbe/localstratumbase.cxx
+++ b/configmgr/source/localbe/localstratumbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localstratumbase.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/localstratumbase.hxx b/configmgr/source/localbe/localstratumbase.hxx
index 8c5fb02fad..a67ca0a6fe 100644
--- a/configmgr/source/localbe/localstratumbase.hxx
+++ b/configmgr/source/localbe/localstratumbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localstratumbase.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/localbe/makefile.mk b/configmgr/source/localbe/makefile.mk
index 5462836be4..2f4aac3e60 100644
--- a/configmgr/source/localbe/makefile.mk
+++ b/configmgr/source/localbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/misc/anypair.cxx b/configmgr/source/misc/anypair.cxx
index 9b763debbf..4a89a5c5b4 100644
--- a/configmgr/source/misc/anypair.cxx
+++ b/configmgr/source/misc/anypair.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: anypair.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/bootstrap.cxx b/configmgr/source/misc/bootstrap.cxx
index 714ed61ac2..7ed1371bde 100644
--- a/configmgr/source/misc/bootstrap.cxx
+++ b/configmgr/source/misc/bootstrap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bootstrap.cxx,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/bootstrapcontext.cxx b/configmgr/source/misc/bootstrapcontext.cxx
index 5bd281f979..425e2db98d 100644
--- a/configmgr/source/misc/bootstrapcontext.cxx
+++ b/configmgr/source/misc/bootstrapcontext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bootstrapcontext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/bufferedfile.cxx b/configmgr/source/misc/bufferedfile.cxx
index e81120667b..ee06d26559 100644
--- a/configmgr/source/misc/bufferedfile.cxx
+++ b/configmgr/source/misc/bufferedfile.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bufferedfile.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/configinteractionhandler.cxx b/configmgr/source/misc/configinteractionhandler.cxx
index a1b48777e2..0abf589d95 100644
--- a/configmgr/source/misc/configinteractionhandler.cxx
+++ b/configmgr/source/misc/configinteractionhandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configinteractionhandler.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/configunoreg.cxx b/configmgr/source/misc/configunoreg.cxx
index e8aed48f5d..6e0ba0952e 100644
--- a/configmgr/source/misc/configunoreg.cxx
+++ b/configmgr/source/misc/configunoreg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configunoreg.cxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/filehelper.cxx b/configmgr/source/misc/filehelper.cxx
index a0e8a5ffa1..407844efda 100644
--- a/configmgr/source/misc/filehelper.cxx
+++ b/configmgr/source/misc/filehelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filehelper.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/interactionrequest.cxx b/configmgr/source/misc/interactionrequest.cxx
index 315a94b396..a8255cc38f 100644
--- a/configmgr/source/misc/interactionrequest.cxx
+++ b/configmgr/source/misc/interactionrequest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interactionrequest.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/logger.cxx b/configmgr/source/misc/logger.cxx
index 3b35c39f27..186f61e6d9 100644
--- a/configmgr/source/misc/logger.cxx
+++ b/configmgr/source/misc/logger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logger.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/makefile.mk b/configmgr/source/misc/makefile.mk
index 8fc6389dc9..b8fa94fc6f 100644
--- a/configmgr/source/misc/makefile.mk
+++ b/configmgr/source/misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.28 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/misc/mergechange.cxx b/configmgr/source/misc/mergechange.cxx
index 53ff14512d..1008c7b1d0 100644
--- a/configmgr/source/misc/mergechange.cxx
+++ b/configmgr/source/misc/mergechange.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mergechange.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/oslstream.cxx b/configmgr/source/misc/oslstream.cxx
index ed4c7056c1..cf9e195b6d 100644
--- a/configmgr/source/misc/oslstream.cxx
+++ b/configmgr/source/misc/oslstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oslstream.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/propertysethelper.cxx b/configmgr/source/misc/propertysethelper.cxx
index 1d68423605..ef92a64be9 100644
--- a/configmgr/source/misc/propertysethelper.cxx
+++ b/configmgr/source/misc/propertysethelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysethelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/providerfactory.cxx b/configmgr/source/misc/providerfactory.cxx
index 77f7432257..a3df2f07b4 100644
--- a/configmgr/source/misc/providerfactory.cxx
+++ b/configmgr/source/misc/providerfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providerfactory.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/providerfactory.hxx b/configmgr/source/misc/providerfactory.hxx
index 5703b06738..f9771ff7c1 100644
--- a/configmgr/source/misc/providerfactory.hxx
+++ b/configmgr/source/misc/providerfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providerfactory.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/providerwrapper.cxx b/configmgr/source/misc/providerwrapper.cxx
index 5fdf876745..67aa41e333 100644
--- a/configmgr/source/misc/providerwrapper.cxx
+++ b/configmgr/source/misc/providerwrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providerwrapper.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/providerwrapper.hxx b/configmgr/source/misc/providerwrapper.hxx
index f402552a09..414f6828e9 100644
--- a/configmgr/source/misc/providerwrapper.hxx
+++ b/configmgr/source/misc/providerwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providerwrapper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/requestoptions.cxx b/configmgr/source/misc/requestoptions.cxx
index 6302e943c5..0e317330a8 100644
--- a/configmgr/source/misc/requestoptions.cxx
+++ b/configmgr/source/misc/requestoptions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: requestoptions.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/serviceinfohelper.cxx b/configmgr/source/misc/serviceinfohelper.cxx
index 8a379b01f4..d7d7fbf3b1 100644
--- a/configmgr/source/misc/serviceinfohelper.cxx
+++ b/configmgr/source/misc/serviceinfohelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: serviceinfohelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/simpleinteractionrequest.cxx b/configmgr/source/misc/simpleinteractionrequest.cxx
index 67deee34b1..f7e18cca2c 100644
--- a/configmgr/source/misc/simpleinteractionrequest.cxx
+++ b/configmgr/source/misc/simpleinteractionrequest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpleinteractionrequest.cxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/strimpl.cxx b/configmgr/source/misc/strimpl.cxx
index acd4f3a10d..0a2c7ab849 100644
--- a/configmgr/source/misc/strimpl.cxx
+++ b/configmgr/source/misc/strimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strimpl.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/misc/tracer.cxx b/configmgr/source/misc/tracer.cxx
index 0632ce0887..80ee459dc7 100644
--- a/configmgr/source/misc/tracer.cxx
+++ b/configmgr/source/misc/tracer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tracer.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/platformbe/componentdefn.cxx b/configmgr/source/platformbe/componentdefn.cxx
index b2a44f8605..1386f0c778 100644
--- a/configmgr/source/platformbe/componentdefn.cxx
+++ b/configmgr/source/platformbe/componentdefn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: componentdefn.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/platformbe/makefile.mk b/configmgr/source/platformbe/makefile.mk
index 9cbe53f5cf..fcc97c0a77 100644
--- a/configmgr/source/platformbe/makefile.mk
+++ b/configmgr/source/platformbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/platformbe/systemintegrationmanager.cxx b/configmgr/source/platformbe/systemintegrationmanager.cxx
index 0fee745f4e..28dc62c106 100644
--- a/configmgr/source/platformbe/systemintegrationmanager.cxx
+++ b/configmgr/source/platformbe/systemintegrationmanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: systemintegrationmanager.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/registry/cfgregistrykey.cxx b/configmgr/source/registry/cfgregistrykey.cxx
index 6b2f6e566c..1f3a73b946 100644
--- a/configmgr/source/registry/cfgregistrykey.cxx
+++ b/configmgr/source/registry/cfgregistrykey.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgregistrykey.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/registry/cfgregistrykey.hxx b/configmgr/source/registry/cfgregistrykey.hxx
index 52c7d0a4be..3aed6ed648 100644
--- a/configmgr/source/registry/cfgregistrykey.hxx
+++ b/configmgr/source/registry/cfgregistrykey.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgregistrykey.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/registry/configregistry.cxx b/configmgr/source/registry/configregistry.cxx
index 636d1fd9db..2b33e05304 100644
--- a/configmgr/source/registry/configregistry.cxx
+++ b/configmgr/source/registry/configregistry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configregistry.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/registry/configregistry.hxx b/configmgr/source/registry/configregistry.hxx
index a682c30787..1d1eafd09a 100644
--- a/configmgr/source/registry/configregistry.hxx
+++ b/configmgr/source/registry/configregistry.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configregistry.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/registry/makefile.mk b/configmgr/source/registry/makefile.mk
index 3a8c12c8f5..3e3fa0981a 100644
--- a/configmgr/source/registry/makefile.mk
+++ b/configmgr/source/registry/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/tree/builddata.cxx b/configmgr/source/tree/builddata.cxx
index 46c8ac3883..be26eae99d 100644
--- a/configmgr/source/tree/builddata.cxx
+++ b/configmgr/source/tree/builddata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: builddata.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/changes.cxx b/configmgr/source/tree/changes.cxx
index 862809ad97..029f5dd80b 100644
--- a/configmgr/source/tree/changes.cxx
+++ b/configmgr/source/tree/changes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: changes.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/cmtree.cxx b/configmgr/source/tree/cmtree.cxx
index 71d7733005..731184e644 100644
--- a/configmgr/source/tree/cmtree.cxx
+++ b/configmgr/source/tree/cmtree.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmtree.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/cmtreemodel.cxx b/configmgr/source/tree/cmtreemodel.cxx
index c9b9116936..b643376810 100644
--- a/configmgr/source/tree/cmtreemodel.cxx
+++ b/configmgr/source/tree/cmtreemodel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmtreemodel.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/localizedtreeactions.cxx b/configmgr/source/tree/localizedtreeactions.cxx
index 24c7fb88b9..3f445ad63b 100644
--- a/configmgr/source/tree/localizedtreeactions.cxx
+++ b/configmgr/source/tree/localizedtreeactions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localizedtreeactions.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/makefile.mk b/configmgr/source/tree/makefile.mk
index 41cf2e0c5f..fd25ee6a0b 100644
--- a/configmgr/source/tree/makefile.mk
+++ b/configmgr/source/tree/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/tree/mergehelper.cxx b/configmgr/source/tree/mergehelper.cxx
index d137032a43..327e16e9a8 100644
--- a/configmgr/source/tree/mergehelper.cxx
+++ b/configmgr/source/tree/mergehelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mergehelper.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/node.cxx b/configmgr/source/tree/node.cxx
index 3ba3a0b9a6..838d2f72fd 100644
--- a/configmgr/source/tree/node.cxx
+++ b/configmgr/source/tree/node.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: node.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/nodeconverter.cxx b/configmgr/source/tree/nodeconverter.cxx
index 0048263401..815c70d06b 100644
--- a/configmgr/source/tree/nodeconverter.cxx
+++ b/configmgr/source/tree/nodeconverter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodeconverter.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/nodevisitor.cxx b/configmgr/source/tree/nodevisitor.cxx
index 1cda707125..5d20ef860f 100644
--- a/configmgr/source/tree/nodevisitor.cxx
+++ b/configmgr/source/tree/nodevisitor.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: nodevisitor.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/configmgr/source/tree/subtree.hxx b/configmgr/source/tree/subtree.hxx
index 2c9e0b4af7..0ee377703f 100644
--- a/configmgr/source/tree/subtree.hxx
+++ b/configmgr/source/tree/subtree.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: subtree.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/treeactions.cxx b/configmgr/source/tree/treeactions.cxx
index 4b782df956..045f9a9f3f 100644
--- a/configmgr/source/tree/treeactions.cxx
+++ b/configmgr/source/tree/treeactions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeactions.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/treechangefactory.cxx b/configmgr/source/tree/treechangefactory.cxx
index 5c7333eba0..efc956a605 100644
--- a/configmgr/source/tree/treechangefactory.cxx
+++ b/configmgr/source/tree/treechangefactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treechangefactory.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/treefragment.cxx b/configmgr/source/tree/treefragment.cxx
index 0ee33b9485..a15f227e00 100644
--- a/configmgr/source/tree/treefragment.cxx
+++ b/configmgr/source/tree/treefragment.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treefragment.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/treenodefactory.cxx b/configmgr/source/tree/treenodefactory.cxx
index 1c34e2f899..31c4765e33 100644
--- a/configmgr/source/tree/treenodefactory.cxx
+++ b/configmgr/source/tree/treenodefactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treenodefactory.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/tree/treesegment.cxx b/configmgr/source/tree/treesegment.cxx
index 5abbc20dc7..99403a03e6 100644
--- a/configmgr/source/tree/treesegment.cxx
+++ b/configmgr/source/tree/treesegment.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: treesegment.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/configmgr/source/tree/updatehelper.cxx b/configmgr/source/tree/updatehelper.cxx
index 17a60be4e2..011d635326 100644
--- a/configmgr/source/tree/updatehelper.cxx
+++ b/configmgr/source/tree/updatehelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: updatehelper.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cacheaccess.cxx b/configmgr/source/treecache/cacheaccess.cxx
index 831cd0f2f4..f2b100575d 100644
--- a/configmgr/source/treecache/cacheaccess.cxx
+++ b/configmgr/source/treecache/cacheaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheaccess.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cacheaccess.hxx b/configmgr/source/treecache/cacheaccess.hxx
index 3956e7861c..7f5c88cde1 100644
--- a/configmgr/source/treecache/cacheaccess.hxx
+++ b/configmgr/source/treecache/cacheaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheaccess.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachecontroller.cxx b/configmgr/source/treecache/cachecontroller.cxx
index 513e134e5a..59ee332565 100644
--- a/configmgr/source/treecache/cachecontroller.cxx
+++ b/configmgr/source/treecache/cachecontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachecontroller.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachecontroller.hxx b/configmgr/source/treecache/cachecontroller.hxx
index bf6ca4b85e..230ed2ead8 100644
--- a/configmgr/source/treecache/cachecontroller.hxx
+++ b/configmgr/source/treecache/cachecontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachecontroller.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachedata.cxx b/configmgr/source/treecache/cachedata.cxx
index 244614426d..dfa2aa726f 100644
--- a/configmgr/source/treecache/cachedata.cxx
+++ b/configmgr/source/treecache/cachedata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachedata.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachedata.hxx b/configmgr/source/treecache/cachedata.hxx
index b2231f59e9..a8d3574331 100644
--- a/configmgr/source/treecache/cachedata.hxx
+++ b/configmgr/source/treecache/cachedata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachedata.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachefactory.cxx b/configmgr/source/treecache/cachefactory.cxx
index 1cc33f2b4f..98a5150038 100644
--- a/configmgr/source/treecache/cachefactory.cxx
+++ b/configmgr/source/treecache/cachefactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachefactory.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cacheline.cxx b/configmgr/source/treecache/cacheline.cxx
index 6125401aaf..73a73cc36c 100644
--- a/configmgr/source/treecache/cacheline.cxx
+++ b/configmgr/source/treecache/cacheline.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheline.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cacheline.hxx b/configmgr/source/treecache/cacheline.hxx
index 5035dac3e9..2a36620580 100644
--- a/configmgr/source/treecache/cacheline.hxx
+++ b/configmgr/source/treecache/cacheline.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheline.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachemulticaster.cxx b/configmgr/source/treecache/cachemulticaster.cxx
index 12e900fe76..c6a813cc04 100644
--- a/configmgr/source/treecache/cachemulticaster.cxx
+++ b/configmgr/source/treecache/cachemulticaster.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemulticaster.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachemulticaster.hxx b/configmgr/source/treecache/cachemulticaster.hxx
index 6fcb7fc13b..15cbb44d98 100644
--- a/configmgr/source/treecache/cachemulticaster.hxx
+++ b/configmgr/source/treecache/cachemulticaster.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemulticaster.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachewritescheduler.cxx b/configmgr/source/treecache/cachewritescheduler.cxx
index 0303a771ab..fbad9a7e5e 100644
--- a/configmgr/source/treecache/cachewritescheduler.cxx
+++ b/configmgr/source/treecache/cachewritescheduler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachewritescheduler.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/cachewritescheduler.hxx b/configmgr/source/treecache/cachewritescheduler.hxx
index 853802b38f..9feeccc7cb 100644
--- a/configmgr/source/treecache/cachewritescheduler.hxx
+++ b/configmgr/source/treecache/cachewritescheduler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachewritescheduler.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/disposetimer.cxx b/configmgr/source/treecache/disposetimer.cxx
index c8afe1270a..e01700ccfe 100644
--- a/configmgr/source/treecache/disposetimer.cxx
+++ b/configmgr/source/treecache/disposetimer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: disposetimer.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/disposetimer.hxx b/configmgr/source/treecache/disposetimer.hxx
index b9ee058321..4c39c3f178 100644
--- a/configmgr/source/treecache/disposetimer.hxx
+++ b/configmgr/source/treecache/disposetimer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: disposetimer.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/invalidatetree.cxx b/configmgr/source/treecache/invalidatetree.cxx
index 9310716171..a867f76239 100644
--- a/configmgr/source/treecache/invalidatetree.cxx
+++ b/configmgr/source/treecache/invalidatetree.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: invalidatetree.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/makefile.mk b/configmgr/source/treecache/makefile.mk
index d8649085bb..e7b4adbdfb 100644
--- a/configmgr/source/treecache/makefile.mk
+++ b/configmgr/source/treecache/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/treecache/timestamp.cxx b/configmgr/source/treecache/timestamp.cxx
index a577bfcb56..179f79f255 100644
--- a/configmgr/source/treecache/timestamp.cxx
+++ b/configmgr/source/treecache/timestamp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: timestamp.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/timestamp.hxx b/configmgr/source/treecache/timestamp.hxx
index a28973bc6c..7ed288457c 100644
--- a/configmgr/source/treecache/timestamp.hxx
+++ b/configmgr/source/treecache/timestamp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: timestamp.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treecache/treemanager.cxx b/configmgr/source/treecache/treemanager.cxx
index 44b36bf53a..4777adc49a 100644
--- a/configmgr/source/treecache/treemanager.cxx
+++ b/configmgr/source/treecache/treemanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treemanager.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/collectchanges.cxx b/configmgr/source/treemgr/collectchanges.cxx
index be8d1d5396..2809129749 100644
--- a/configmgr/source/treemgr/collectchanges.cxx
+++ b/configmgr/source/treemgr/collectchanges.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: collectchanges.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/collectchanges.hxx b/configmgr/source/treemgr/collectchanges.hxx
index c8a924e3e2..a49eb9bb28 100644
--- a/configmgr/source/treemgr/collectchanges.hxx
+++ b/configmgr/source/treemgr/collectchanges.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: collectchanges.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/configdefaultprovider.cxx b/configmgr/source/treemgr/configdefaultprovider.cxx
index c36d5ded16..c16fbf8ca2 100644
--- a/configmgr/source/treemgr/configdefaultprovider.cxx
+++ b/configmgr/source/treemgr/configdefaultprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configdefaultprovider.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/configexcept.cxx b/configmgr/source/treemgr/configexcept.cxx
index 4c4df0eb61..68224cff7b 100644
--- a/configmgr/source/treemgr/configexcept.cxx
+++ b/configmgr/source/treemgr/configexcept.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configexcept.cxx,v $
- * $Revision: 1.7.10.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/configgroup.cxx b/configmgr/source/treemgr/configgroup.cxx
index 5420a61394..84bc9f10d0 100644
--- a/configmgr/source/treemgr/configgroup.cxx
+++ b/configmgr/source/treemgr/configgroup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configgroup.cxx,v $
- * $Revision: 1.14.14.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/configpath.cxx b/configmgr/source/treemgr/configpath.cxx
index 6a10b72b03..bc405b96a4 100644
--- a/configmgr/source/treemgr/configpath.cxx
+++ b/configmgr/source/treemgr/configpath.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configpath.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/configset.cxx b/configmgr/source/treemgr/configset.cxx
index 941136728d..14e8624170 100644
--- a/configmgr/source/treemgr/configset.cxx
+++ b/configmgr/source/treemgr/configset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configset.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/defaultproviderproxy.cxx b/configmgr/source/treemgr/defaultproviderproxy.cxx
index 89a0fdf00d..478cebdcaf 100644
--- a/configmgr/source/treemgr/defaultproviderproxy.cxx
+++ b/configmgr/source/treemgr/defaultproviderproxy.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defaultproviderproxy.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/defaultproviderproxy.hxx b/configmgr/source/treemgr/defaultproviderproxy.hxx
index 7d1867015d..7e61036fb1 100644
--- a/configmgr/source/treemgr/defaultproviderproxy.hxx
+++ b/configmgr/source/treemgr/defaultproviderproxy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defaultproviderproxy.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/deferredview.cxx b/configmgr/source/treemgr/deferredview.cxx
index 5e82a08f36..1bc7fa86c0 100644
--- a/configmgr/source/treemgr/deferredview.cxx
+++ b/configmgr/source/treemgr/deferredview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: deferredview.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/deferredview.hxx b/configmgr/source/treemgr/deferredview.hxx
index 4aa90f8513..3a3c7ab975 100644
--- a/configmgr/source/treemgr/deferredview.hxx
+++ b/configmgr/source/treemgr/deferredview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: deferredview.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/directview.cxx b/configmgr/source/treemgr/directview.cxx
index 16737a23a1..c29aafa1b0 100644
--- a/configmgr/source/treemgr/directview.cxx
+++ b/configmgr/source/treemgr/directview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: directview.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/directview.hxx b/configmgr/source/treemgr/directview.hxx
index 473f09730e..e4dd7171db 100644
--- a/configmgr/source/treemgr/directview.hxx
+++ b/configmgr/source/treemgr/directview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: directview.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/groupnodeimpl.hxx b/configmgr/source/treemgr/groupnodeimpl.hxx
index cf9d9ac6d8..77b48b168f 100644
--- a/configmgr/source/treemgr/groupnodeimpl.hxx
+++ b/configmgr/source/treemgr/groupnodeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupnodeimpl.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/makefile.mk b/configmgr/source/treemgr/makefile.mk
index ba98a6a161..5950e78a5c 100644
--- a/configmgr/source/treemgr/makefile.mk
+++ b/configmgr/source/treemgr/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/treemgr/nodechange.cxx b/configmgr/source/treemgr/nodechange.cxx
index cfffd7cc15..38b844f02f 100644
--- a/configmgr/source/treemgr/nodechange.cxx
+++ b/configmgr/source/treemgr/nodechange.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodechange.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodechangeimpl.cxx b/configmgr/source/treemgr/nodechangeimpl.cxx
index aa049fa600..5094359c43 100644
--- a/configmgr/source/treemgr/nodechangeimpl.cxx
+++ b/configmgr/source/treemgr/nodechangeimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodechangeimpl.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodechangeimpl.hxx b/configmgr/source/treemgr/nodechangeimpl.hxx
index 5040b7d214..335199956e 100644
--- a/configmgr/source/treemgr/nodechangeimpl.hxx
+++ b/configmgr/source/treemgr/nodechangeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodechangeimpl.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodechangeinfo.cxx b/configmgr/source/treemgr/nodechangeinfo.cxx
index 9a6a0c21c6..b9f9ccb41a 100644
--- a/configmgr/source/treemgr/nodechangeinfo.cxx
+++ b/configmgr/source/treemgr/nodechangeinfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodechangeinfo.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodefactory.cxx b/configmgr/source/treemgr/nodefactory.cxx
index 3c9deb28ff..d3fa574f4e 100644
--- a/configmgr/source/treemgr/nodefactory.cxx
+++ b/configmgr/source/treemgr/nodefactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodefactory.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodefactory.hxx b/configmgr/source/treemgr/nodefactory.hxx
index 73c9e9603b..3d6ec135c4 100644
--- a/configmgr/source/treemgr/nodefactory.hxx
+++ b/configmgr/source/treemgr/nodefactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodefactory.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodeimpl.cxx b/configmgr/source/treemgr/nodeimpl.cxx
index 5c4abf60be..5206561f9b 100644
--- a/configmgr/source/treemgr/nodeimpl.cxx
+++ b/configmgr/source/treemgr/nodeimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodeimpl.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodeimpl.hxx b/configmgr/source/treemgr/nodeimpl.hxx
index e4b350c30c..025171e252 100644
--- a/configmgr/source/treemgr/nodeimpl.hxx
+++ b/configmgr/source/treemgr/nodeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodeimpl.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodeimplobj.cxx b/configmgr/source/treemgr/nodeimplobj.cxx
index 128bb97baa..f0819f2338 100644
--- a/configmgr/source/treemgr/nodeimplobj.cxx
+++ b/configmgr/source/treemgr/nodeimplobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodeimplobj.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/nodeimplobj.hxx b/configmgr/source/treemgr/nodeimplobj.hxx
index 4aa2431958..c7f37f9bbf 100644
--- a/configmgr/source/treemgr/nodeimplobj.hxx
+++ b/configmgr/source/treemgr/nodeimplobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nodeimplobj.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/noderef.cxx b/configmgr/source/treemgr/noderef.cxx
index c7aeeca267..8886cbbed0 100644
--- a/configmgr/source/treemgr/noderef.cxx
+++ b/configmgr/source/treemgr/noderef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: noderef.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/readonlyview.cxx b/configmgr/source/treemgr/readonlyview.cxx
index ad06141ad0..b0380d0474 100644
--- a/configmgr/source/treemgr/readonlyview.cxx
+++ b/configmgr/source/treemgr/readonlyview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: readonlyview.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/readonlyview.hxx b/configmgr/source/treemgr/readonlyview.hxx
index 271a192286..6e30d63e65 100644
--- a/configmgr/source/treemgr/readonlyview.hxx
+++ b/configmgr/source/treemgr/readonlyview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: readonlyview.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/roottree.cxx b/configmgr/source/treemgr/roottree.cxx
index 0b8e895cb0..a75fd46179 100644
--- a/configmgr/source/treemgr/roottree.cxx
+++ b/configmgr/source/treemgr/roottree.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: roottree.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/roottreeimpl.hxx b/configmgr/source/treemgr/roottreeimpl.hxx
index f9466b0255..699c832614 100644
--- a/configmgr/source/treemgr/roottreeimpl.hxx
+++ b/configmgr/source/treemgr/roottreeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: roottreeimpl.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/setnodeimpl.cxx b/configmgr/source/treemgr/setnodeimpl.cxx
index 91dabe58a5..58a4df6a34 100644
--- a/configmgr/source/treemgr/setnodeimpl.cxx
+++ b/configmgr/source/treemgr/setnodeimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setnodeimpl.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/setnodeimpl.hxx b/configmgr/source/treemgr/setnodeimpl.hxx
index ba1bfaafd9..bad52b5f61 100644
--- a/configmgr/source/treemgr/setnodeimpl.hxx
+++ b/configmgr/source/treemgr/setnodeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setnodeimpl.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/template.cxx b/configmgr/source/treemgr/template.cxx
index 1f8249c63f..3f16534c7e 100644
--- a/configmgr/source/treemgr/template.cxx
+++ b/configmgr/source/treemgr/template.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: template.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/templateimpl.cxx b/configmgr/source/treemgr/templateimpl.cxx
index 87bccef5d2..b88c849e7e 100644
--- a/configmgr/source/treemgr/templateimpl.cxx
+++ b/configmgr/source/treemgr/templateimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: templateimpl.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/templateimpl.hxx b/configmgr/source/treemgr/templateimpl.hxx
index 1142c59f02..1b863cf6a4 100644
--- a/configmgr/source/treemgr/templateimpl.hxx
+++ b/configmgr/source/treemgr/templateimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: templateimpl.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/treeimpl.cxx b/configmgr/source/treemgr/treeimpl.cxx
index ec0e3afece..d277ade9d3 100644
--- a/configmgr/source/treemgr/treeimpl.cxx
+++ b/configmgr/source/treemgr/treeimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeimpl.cxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/valuemembernode.cxx b/configmgr/source/treemgr/valuemembernode.cxx
index d56c811ab5..115e3c2b40 100644
--- a/configmgr/source/treemgr/valuemembernode.cxx
+++ b/configmgr/source/treemgr/valuemembernode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valuemembernode.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/valuemembernode.hxx b/configmgr/source/treemgr/valuemembernode.hxx
index 7fac046425..08afbf3ead 100644
--- a/configmgr/source/treemgr/valuemembernode.hxx
+++ b/configmgr/source/treemgr/valuemembernode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valuemembernode.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/valuenodeimpl.hxx b/configmgr/source/treemgr/valuenodeimpl.hxx
index ed17bca95c..2b185d2fca 100644
--- a/configmgr/source/treemgr/valuenodeimpl.hxx
+++ b/configmgr/source/treemgr/valuenodeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valuenodeimpl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewaccess.cxx b/configmgr/source/treemgr/viewaccess.cxx
index cc0765903e..63c1804c03 100644
--- a/configmgr/source/treemgr/viewaccess.cxx
+++ b/configmgr/source/treemgr/viewaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewaccess.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewaccess.hxx b/configmgr/source/treemgr/viewaccess.hxx
index 0127d973c8..2c4d2061c7 100644
--- a/configmgr/source/treemgr/viewaccess.hxx
+++ b/configmgr/source/treemgr/viewaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewaccess.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewfactory.hxx b/configmgr/source/treemgr/viewfactory.hxx
index e3a12fec39..4e09a1cdfa 100644
--- a/configmgr/source/treemgr/viewfactory.hxx
+++ b/configmgr/source/treemgr/viewfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewfactory.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewnode.cxx b/configmgr/source/treemgr/viewnode.cxx
index f0f387961e..c1c49556ff 100644
--- a/configmgr/source/treemgr/viewnode.cxx
+++ b/configmgr/source/treemgr/viewnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewnode.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewnode.hxx b/configmgr/source/treemgr/viewnode.hxx
index 2b37f0b3bb..33213a4fac 100644
--- a/configmgr/source/treemgr/viewnode.hxx
+++ b/configmgr/source/treemgr/viewnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewnode.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewstrategy.cxx b/configmgr/source/treemgr/viewstrategy.cxx
index 0b0fa04229..cd4fb93d27 100644
--- a/configmgr/source/treemgr/viewstrategy.cxx
+++ b/configmgr/source/treemgr/viewstrategy.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewstrategy.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/treemgr/viewstrategy.hxx b/configmgr/source/treemgr/viewstrategy.hxx
index 8e77c0bf4a..1d66f1769b 100644
--- a/configmgr/source/treemgr/viewstrategy.hxx
+++ b/configmgr/source/treemgr/viewstrategy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewstrategy.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/basicparser.cxx b/configmgr/source/xml/basicparser.cxx
index fc30410dfa..7a01e56600 100644
--- a/configmgr/source/xml/basicparser.cxx
+++ b/configmgr/source/xml/basicparser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicparser.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/basicparser.hxx b/configmgr/source/xml/basicparser.hxx
index f8bb218520..a80a813caa 100644
--- a/configmgr/source/xml/basicparser.hxx
+++ b/configmgr/source/xml/basicparser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicparser.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/elementformatter.cxx b/configmgr/source/xml/elementformatter.cxx
index 3b0a48e9f0..14ca2a05e9 100644
--- a/configmgr/source/xml/elementformatter.cxx
+++ b/configmgr/source/xml/elementformatter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementformatter.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/elementformatter.hxx b/configmgr/source/xml/elementformatter.hxx
index 930aaaeb1c..88a3856610 100644
--- a/configmgr/source/xml/elementformatter.hxx
+++ b/configmgr/source/xml/elementformatter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementformatter.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/elementinfo.hxx b/configmgr/source/xml/elementinfo.hxx
index 8bb00b49b8..03d9da3677 100644
--- a/configmgr/source/xml/elementinfo.hxx
+++ b/configmgr/source/xml/elementinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementinfo.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/elementparser.cxx b/configmgr/source/xml/elementparser.cxx
index 12ea5dde5c..3f0c07c1a9 100644
--- a/configmgr/source/xml/elementparser.cxx
+++ b/configmgr/source/xml/elementparser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementparser.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/elementparser.hxx b/configmgr/source/xml/elementparser.hxx
index 9cbea22775..9e58c9f6a9 100644
--- a/configmgr/source/xml/elementparser.hxx
+++ b/configmgr/source/xml/elementparser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementparser.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/layerparser.cxx b/configmgr/source/xml/layerparser.cxx
index 10797b5a34..7ce165beda 100644
--- a/configmgr/source/xml/layerparser.cxx
+++ b/configmgr/source/xml/layerparser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerparser.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/layerparser.hxx b/configmgr/source/xml/layerparser.hxx
index f871fbf85f..30c33fae3c 100644
--- a/configmgr/source/xml/layerparser.hxx
+++ b/configmgr/source/xml/layerparser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerparser.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/layerwriter.cxx b/configmgr/source/xml/layerwriter.cxx
index 8c47d0164f..2dab624547 100644
--- a/configmgr/source/xml/layerwriter.cxx
+++ b/configmgr/source/xml/layerwriter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerwriter.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/layerwriter.hxx b/configmgr/source/xml/layerwriter.hxx
index f05c004146..fc6ca24826 100644
--- a/configmgr/source/xml/layerwriter.hxx
+++ b/configmgr/source/xml/layerwriter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerwriter.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/makefile.mk b/configmgr/source/xml/makefile.mk
index 61d3ac6557..ce5a1c4b3a 100644
--- a/configmgr/source/xml/makefile.mk
+++ b/configmgr/source/xml/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.27 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/source/xml/matchlocale.cxx b/configmgr/source/xml/matchlocale.cxx
index 1e8f400811..96cc1e2e22 100644
--- a/configmgr/source/xml/matchlocale.cxx
+++ b/configmgr/source/xml/matchlocale.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: matchlocale.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/parsersvc.cxx b/configmgr/source/xml/parsersvc.cxx
index 9337d1700c..539e138c31 100644
--- a/configmgr/source/xml/parsersvc.cxx
+++ b/configmgr/source/xml/parsersvc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parsersvc.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/parsersvc.hxx b/configmgr/source/xml/parsersvc.hxx
index 99afeae76f..7883121e1b 100644
--- a/configmgr/source/xml/parsersvc.hxx
+++ b/configmgr/source/xml/parsersvc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parsersvc.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/schemaparser.cxx b/configmgr/source/xml/schemaparser.cxx
index 83d7efa766..669a6d2c79 100644
--- a/configmgr/source/xml/schemaparser.cxx
+++ b/configmgr/source/xml/schemaparser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: schemaparser.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/schemaparser.hxx b/configmgr/source/xml/schemaparser.hxx
index 0c6e1ec999..bd1b6e3575 100644
--- a/configmgr/source/xml/schemaparser.hxx
+++ b/configmgr/source/xml/schemaparser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: schemaparser.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/simpletypehelper.cxx b/configmgr/source/xml/simpletypehelper.cxx
index d106cae453..438e8833d6 100644
--- a/configmgr/source/xml/simpletypehelper.cxx
+++ b/configmgr/source/xml/simpletypehelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletypehelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/typeconverter.cxx b/configmgr/source/xml/typeconverter.cxx
index a422073a0d..787d35a294 100644
--- a/configmgr/source/xml/typeconverter.cxx
+++ b/configmgr/source/xml/typeconverter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: typeconverter.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/valueconverter.cxx b/configmgr/source/xml/valueconverter.cxx
index 7143dd6260..c98c418543 100644
--- a/configmgr/source/xml/valueconverter.cxx
+++ b/configmgr/source/xml/valueconverter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valueconverter.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/valueformatter.cxx b/configmgr/source/xml/valueformatter.cxx
index 6ff1a3b10f..f66e72c2ab 100644
--- a/configmgr/source/xml/valueformatter.cxx
+++ b/configmgr/source/xml/valueformatter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valueformatter.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/valueformatter.hxx b/configmgr/source/xml/valueformatter.hxx
index 9ca61bf815..1714e2694c 100644
--- a/configmgr/source/xml/valueformatter.hxx
+++ b/configmgr/source/xml/valueformatter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valueformatter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/writersvc.cxx b/configmgr/source/xml/writersvc.cxx
index c68334c2e1..057d2c1b56 100644
--- a/configmgr/source/xml/writersvc.cxx
+++ b/configmgr/source/xml/writersvc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: writersvc.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/writersvc.hxx b/configmgr/source/xml/writersvc.hxx
index f42fe0f21b..54fd684c31 100644
--- a/configmgr/source/xml/writersvc.hxx
+++ b/configmgr/source/xml/writersvc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: writersvc.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/xmlstrings.cxx b/configmgr/source/xml/xmlstrings.cxx
index 83de183fca..7d5460149b 100644
--- a/configmgr/source/xml/xmlstrings.cxx
+++ b/configmgr/source/xml/xmlstrings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlstrings.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/source/xml/xmlstrings.hxx b/configmgr/source/xml/xmlstrings.hxx
index 3f70697332..89e998db69 100644
--- a/configmgr/source/xml/xmlstrings.hxx
+++ b/configmgr/source/xml/xmlstrings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlstrings.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk
index eaea5d3435..772e60deaf 100644
--- a/configmgr/util/makefile.mk
+++ b/configmgr/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.25 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/version.mk b/configmgr/version.mk
index d5886b08b2..80a6db315f 100644
--- a/configmgr/version.mk
+++ b/configmgr/version.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/workben/apitest/cfgadduser.cxx b/configmgr/workben/apitest/cfgadduser.cxx
index 38539074d2..0c3515775e 100644
--- a/configmgr/workben/apitest/cfgadduser.cxx
+++ b/configmgr/workben/apitest/cfgadduser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgadduser.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/apitest/cfgadmin.cxx b/configmgr/workben/apitest/cfgadmin.cxx
index 0be8d861a0..89f1f5c89c 100644
--- a/configmgr/workben/apitest/cfgadmin.cxx
+++ b/configmgr/workben/apitest/cfgadmin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgadmin.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/apitest/cfgapi.cxx b/configmgr/workben/apitest/cfgapi.cxx
index f774027c9c..ee6408d390 100644
--- a/configmgr/workben/apitest/cfgapi.cxx
+++ b/configmgr/workben/apitest/cfgapi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgapi.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/apitest/cfgapi_timetest.cxx b/configmgr/workben/apitest/cfgapi_timetest.cxx
index c7d32eb783..6b9096823a 100644
--- a/configmgr/workben/apitest/cfgapi_timetest.cxx
+++ b/configmgr/workben/apitest/cfgapi_timetest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgapi_timetest.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/apitest/cfgregistry.cxx b/configmgr/workben/apitest/cfgregistry.cxx
index a1f26c25cc..fcb450653d 100644
--- a/configmgr/workben/apitest/cfgregistry.cxx
+++ b/configmgr/workben/apitest/cfgregistry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgregistry.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/apitest/cfgupdate.cxx b/configmgr/workben/apitest/cfgupdate.cxx
index 54722c0617..689034b3b2 100644
--- a/configmgr/workben/apitest/cfgupdate.cxx
+++ b/configmgr/workben/apitest/cfgupdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgupdate.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/apitest/makefile.mk b/configmgr/workben/apitest/makefile.mk
index 08b46a53f8..78de78f466 100644
--- a/configmgr/workben/apitest/makefile.mk
+++ b/configmgr/workben/apitest/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/workben/local_io/cfgfile.cxx b/configmgr/workben/local_io/cfgfile.cxx
index b5c60ecb7b..08d54b9a96 100644
--- a/configmgr/workben/local_io/cfgfile.cxx
+++ b/configmgr/workben/local_io/cfgfile.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgfile.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/local_io/cfglocal.cxx b/configmgr/workben/local_io/cfglocal.cxx
index c5de94c03f..425c62f522 100644
--- a/configmgr/workben/local_io/cfglocal.cxx
+++ b/configmgr/workben/local_io/cfglocal.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfglocal.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/local_io/filetest.cxx b/configmgr/workben/local_io/filetest.cxx
index 52ecdf555e..0a8038e3ae 100644
--- a/configmgr/workben/local_io/filetest.cxx
+++ b/configmgr/workben/local_io/filetest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filetest.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/local_io/makefile.mk b/configmgr/workben/local_io/makefile.mk
index 9b839d0fd7..8268cf6268 100644
--- a/configmgr/workben/local_io/makefile.mk
+++ b/configmgr/workben/local_io/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/workben/local_io/simpletest.cxx b/configmgr/workben/local_io/simpletest.cxx
index 8a69ed9e3b..74f0bd8ce2 100644
--- a/configmgr/workben/local_io/simpletest.cxx
+++ b/configmgr/workben/local_io/simpletest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletest.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/local_io/xmlexport.cxx b/configmgr/workben/local_io/xmlexport.cxx
index 8118b775f5..65e9456ba6 100644
--- a/configmgr/workben/local_io/xmlexport.cxx
+++ b/configmgr/workben/local_io/xmlexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlexport.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/local_io/xmlimport.cxx b/configmgr/workben/local_io/xmlimport.cxx
index f206490fda..edba7a72bd 100644
--- a/configmgr/workben/local_io/xmlimport.cxx
+++ b/configmgr/workben/local_io/xmlimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlimport.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/logger/loggerdfn.cxx b/configmgr/workben/logger/loggerdfn.cxx
index ae8931435b..0e0f62cbaa 100644
--- a/configmgr/workben/logger/loggerdfn.cxx
+++ b/configmgr/workben/logger/loggerdfn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loggerdfn.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/logger/makefile.mk b/configmgr/workben/logger/makefile.mk
index a7d37cb002..0b187b6220 100644
--- a/configmgr/workben/logger/makefile.mk
+++ b/configmgr/workben/logger/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/workben/logger/simplelogger.cxx b/configmgr/workben/logger/simplelogger.cxx
index 2fb8de0937..17bc5c4fa9 100644
--- a/configmgr/workben/logger/simplelogger.cxx
+++ b/configmgr/workben/logger/simplelogger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simplelogger.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/logmechanism.hxx b/configmgr/workben/memory/logmechanism.hxx
index a3e4dde7f9..a8a8b49e1c 100644
--- a/configmgr/workben/memory/logmechanism.hxx
+++ b/configmgr/workben/memory/logmechanism.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logmechanism.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/main.cxx b/configmgr/workben/memory/main.cxx
index f87267478e..054cc48564 100644
--- a/configmgr/workben/memory/main.cxx
+++ b/configmgr/workben/memory/main.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/makefile.mk b/configmgr/workben/memory/makefile.mk
index cad7b533e6..3735c55b3e 100644
--- a/configmgr/workben/memory/makefile.mk
+++ b/configmgr/workben/memory/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/configmgr/workben/memory/memorymeasure.hxx b/configmgr/workben/memory/memorymeasure.hxx
index 963af50468..1900a12446 100644
--- a/configmgr/workben/memory/memorymeasure.hxx
+++ b/configmgr/workben/memory/memorymeasure.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: memorymeasure.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/memorytests.cxx b/configmgr/workben/memory/memorytests.cxx
index 263bd7186d..1a309df03e 100644
--- a/configmgr/workben/memory/memorytests.cxx
+++ b/configmgr/workben/memory/memorytests.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: memorytests.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/testmodules.cxx b/configmgr/workben/memory/testmodules.cxx
index 612333e656..8fec6388ec 100644
--- a/configmgr/workben/memory/testmodules.cxx
+++ b/configmgr/workben/memory/testmodules.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testmodules.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/testmodules.hxx b/configmgr/workben/memory/testmodules.hxx
index b8a5aa9f9b..96d6becf77 100644
--- a/configmgr/workben/memory/testmodules.hxx
+++ b/configmgr/workben/memory/testmodules.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: testmodules.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/configmgr/workben/memory/treeload.cxx b/configmgr/workben/memory/treeload.cxx
index 5de5d4ca9b..80a843751c 100644
--- a/configmgr/workben/memory/treeload.cxx
+++ b/configmgr/workben/memory/treeload.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeload.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
index f8ae5ac94a..af8bced798 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FileSystemRuntimeException.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 5750ac8417..451dc6b1e3 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NativeLibraries.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index a3dac8f4e2..fc20dbb093 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NativeStorageAccess.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 7c1fcc6ccb..41fa6bb28e 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageAccess.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index ca5ce4dcb9..4e24cd4c93 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageFileAccess.java,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
index 3977a4869e..ee07e76d14 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
@@ -1,14 +1,10 @@
 #************************************************************************* 
 # 
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/dbtools.pmk b/connectivity/dbtools.pmk
index 89a56d1321..6b50f3219e 100644
--- a/connectivity/dbtools.pmk
+++ b/connectivity/dbtools.pmk
@@ -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: $
-#
-# $Revision: $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index 82988422d0..11965c1226 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CommonTools.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx
index af1fa6e954..2b41522388 100644
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConnectionWrapper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx
index 0cc168f322..4c1f668fa1 100644
--- a/connectivity/inc/connectivity/DateConversion.hxx
+++ b/connectivity/inc/connectivity/DateConversion.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DateConversion.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index ceff42f48a..e932370cb8 100755..100644
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: makefile,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 8bcfa0eaed..55a6fdc52b 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FValue.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx
index b90ea0dd69..377d1abef7 100644
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/connectivity/inc/connectivity/IParseContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IParseContext.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 1afb8934da..86fc07c5a0 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PColumn.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx
index a26c8b12e2..91a8dd51c0 100644
--- a/connectivity/inc/connectivity/ParameterCont.hxx
+++ b/connectivity/inc/connectivity/ParameterCont.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParameterCont.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx
index 5ec117c4f1..5b26324255 100644
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/connectivity/inc/connectivity/StdTypeDefs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StdTypeDefs.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx
index 934a326cea..ecf41f8a56 100644
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/connectivity/inc/connectivity/TColumnsHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TColumnsHelper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx
index 6a2ce04ea9..bdf64b506f 100644
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/connectivity/inc/connectivity/TIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TIndex.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index 779905b2c5..4c5aab6d99 100644
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TIndexColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index 284aac5bc4..9d4eb1b99b 100644
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TIndexes.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx
index 995351620f..63eea55333 100644
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/connectivity/inc/connectivity/TKey.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKey.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx
index 0b0d148eb6..7b45568a29 100644
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/connectivity/TKeyColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKeyColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx
index 8e4b7b7dcc..781774689e 100644
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/connectivity/inc/connectivity/TKeys.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKeys.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index ea9d4a57d4..f60841294a 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TTableHelper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx
index c31aab57d5..3139b7ef11 100644
--- a/connectivity/inc/connectivity/conncleanup.hxx
+++ b/connectivity/inc/connectivity/conncleanup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: conncleanup.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx
index 481933326e..da5fe543b8 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbcharset.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index a19d76f3f2..e42e996369 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbconversion.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx
index 682a6d9976..b9bf0e19c7 100644
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/connectivity/inc/connectivity/dbexception.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbexception.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 6a0757ad2c..1f95c341ec 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbmetadata.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 8afd0b7fa6..a537b70f4c 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtools.hxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
index 23cadc513a..6044a53e33 100644
--- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx
+++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: $
-*
-* $Revision: $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index f46d27043b..71494de67b 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtermanager.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index adaf558b98..6b3f477cfe 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formattedcolumnvalue.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 00fa851aad..f9a8fec9a1 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parameters.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index ad7fb4fc56..34e2fef67b 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paramwrapper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx
index a3488a8b3c..cd87da3324 100644
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/connectivity/inc/connectivity/predicateinput.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: predicateinput.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
index 981905f937..b53266f403 100644
--- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IRefreshable.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 840cfb49cf..85a67d2d82 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VCatalog.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 462815ea53..535b68335e 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VCollection.hxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index 8f9495998b..4a30a847aa 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VColumn.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
index bc8bc7c9dd..e0e9ef52f2 100644
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VDescriptor.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index de022acc40..20e8f138c4 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VGroup.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 8f3145b305..e32d957d75 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VIndex.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
index e6dc7b1cf8..2844e34fdf 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VIndexColumn.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index 1eee05742e..6c673cb15c 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VKey.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
index 5266986011..dadf455a4e 100644
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VKeyColumn.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index f90446b421..e2627fc895 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VTable.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
index cf6e211bf5..386cb254a6 100644
--- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VTypeDef.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index 348102c902..2b78a999f9 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VUser.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 0537c27316..c32dff4921 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VView.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index ed7110a9f0..3d6be7edf3 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlerror.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 9d39e2a997..eab26924aa 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqliterator.hxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index ad04cd29f4..b3b59c1ff7 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlnode.hxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 6518a81933..1a9c324d62 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlparse.hxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/connectivity/inc/connectivity/standardsqlstate.hxx
index b9c9d549d0..5f855a890f 100644
--- a/connectivity/inc/connectivity/standardsqlstate.hxx
+++ b/connectivity/inc/connectivity/standardsqlstate.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: standardsqlstate.hxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef CONNECTIVITY_STANDARD_SQL_STATE_HXX
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index 03015ceff8..3dde4d8e0b 100644
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statementcomposer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx
index a2d8bd1e31..a580a69384 100644
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/connectivity/inc/connectivity/virtualdbtools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: virtualdbtools.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
index a2cfdb3fe9..6ed2c90d2e 100644
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: warnings.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk
index 4b830c25ff..74151d0cf4 100644
--- a/connectivity/inc/makefile.mk
+++ b/connectivity/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/inc/pch/precompiled_connectivity.cxx b/connectivity/inc/pch/precompiled_connectivity.cxx
index 0a6febcce7..edbfe38016 100644
--- a/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/connectivity/inc/pch/precompiled_connectivity.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_connectivity.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index ae486e9b3b..d263d5d5f1 100644
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_connectivity.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/makefile.pmk b/connectivity/makefile.pmk
index ede06e49d3..6446526692 100755..100644
--- a/connectivity/makefile.pmk
+++ b/connectivity/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/qa/connectivity/GeneralTest.java b/connectivity/qa/connectivity/GeneralTest.java
index f6284ff390..3281bb9b57 100644
--- a/connectivity/qa/connectivity/GeneralTest.java
+++ b/connectivity/qa/connectivity/GeneralTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GeneralTest.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/makefile.mk b/connectivity/qa/connectivity/makefile.mk
index 9dd5daf4e9..af2c186b54 100644
--- a/connectivity/qa/connectivity/makefile.mk
+++ b/connectivity/qa/connectivity/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3.60.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 60a35c1d3d..40f62c5a03 100755..100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -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: RowSetEventListener.java,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/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 578d906fb2..a54eb6fa10 100644
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataSource.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/DatabaseAccess.java b/connectivity/qa/connectivity/tools/DatabaseAccess.java
index bc39bb0990..6baa41c613 100755..100644
--- a/connectivity/qa/connectivity/tools/DatabaseAccess.java
+++ b/connectivity/qa/connectivity/tools/DatabaseAccess.java
@@ -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: RowSetEventListener.java,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/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index be41dfae39..d8294f464c 100755..100644
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbaseDatabase.java,v $
- * $Revision: 1.4.50.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index 2fbbe7b694..c0c46d0714 100644
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HsqlColumnDescriptor.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index b1af0c118e..c477f036ba 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HsqlDatabase.java,v $
- * $Revision: 1.4.50.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
index 483241904b..27f857309e 100644
--- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HsqlTableDescriptor.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java
index e2aa4fcfc3..ebc9d1a25c 100644
--- a/connectivity/qa/connectivity/tools/QueryDefinition.java
+++ b/connectivity/qa/connectivity/tools/QueryDefinition.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: QueryDefinition.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/RowSet.java b/connectivity/qa/connectivity/tools/RowSet.java
index 9fbba57b6d..a26456dcc7 100644
--- a/connectivity/qa/connectivity/tools/RowSet.java
+++ b/connectivity/qa/connectivity/tools/RowSet.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RowSet.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index 589a85ea38..8de77890b7 100644
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.60.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java b/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
index 1c0ff72b34..b48ae21583 100644
--- a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
+++ b/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DBaseDateFunctions.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/dbase/DBaseDriverTest.java b/connectivity/qa/drivers/dbase/DBaseDriverTest.java
index f25d02f122..2e2920b414 100644
--- a/connectivity/qa/drivers/dbase/DBaseDriverTest.java
+++ b/connectivity/qa/drivers/dbase/DBaseDriverTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DBaseDriverTest.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java b/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
index d76456536a..b3c8ff014a 100644
--- a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
+++ b/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DBaseNumericFunctions.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/dbase/DBaseSqlTests.java b/connectivity/qa/drivers/dbase/DBaseSqlTests.java
index c60352636f..5f3de90179 100755..100644
--- a/connectivity/qa/drivers/dbase/DBaseSqlTests.java
+++ b/connectivity/qa/drivers/dbase/DBaseSqlTests.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DBaseStringFunctions.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java b/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
index f6a35dafc7..1d4ccf0a9b 100644
--- a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
+++ b/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DBaseStringFunctions.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/dbase/makefile.mk b/connectivity/qa/drivers/dbase/makefile.mk
index 4544b2a2bc..d6cb569a5d 100644
--- a/connectivity/qa/drivers/dbase/makefile.mk
+++ b/connectivity/qa/drivers/dbase/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7.60.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/qa/drivers/hsqldb/DriverTest.java b/connectivity/qa/drivers/hsqldb/DriverTest.java
index 5e0c91d2cb..d8375a73d5 100644
--- a/connectivity/qa/drivers/hsqldb/DriverTest.java
+++ b/connectivity/qa/drivers/hsqldb/DriverTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DriverTest.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/jdbc/LongVarCharTest.java b/connectivity/qa/drivers/jdbc/LongVarCharTest.java
index 1d354b087c..a5797b223b 100644
--- a/connectivity/qa/drivers/jdbc/LongVarCharTest.java
+++ b/connectivity/qa/drivers/jdbc/LongVarCharTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LongVarCharTest.java,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/qa/drivers/jdbc/makefile.mk b/connectivity/qa/drivers/jdbc/makefile.mk
index 1e641bdd62..aa9994ab94 100644
--- a/connectivity/qa/drivers/jdbc/makefile.mk
+++ b/connectivity/qa/drivers/jdbc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2.26.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 3b611dd6b1..6d80e5c542 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoRetrievingBase.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 63d8594cdd..6bf66a4fec 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CommonTools.cxx,v $
- * $Revision: 1.26.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index d417c33163..01c10ff8e5 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConnectionWrapper.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index bee1b9a69e..1f90532f60 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DateConversion.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index b4cee320dc..1bf1cb7867 100755..100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: makefile,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #include "connectivity/DriversConfig.hxx"
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 17fe520b1d..e776a3c386 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index fa2789c29a..7d25e73824 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaDataResultSetMetaData.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 3068acde8b..c3952465f7 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FValue.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 0628e4a392..a2a80d21ec 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index fe814821e5..f8e899a714 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RowFunctionParser.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 032d859575..9f559a92b7 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TColumnsHelper.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index 36b5c8a315..af0ff8d818 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TConnection.cxx,v $
- * $Revision: 1.9.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 1a763b0c10..6bdf2c7b7a 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TDatabaseMetaDataBase.cxx,v $
- * $Revision: 1.8.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index bfb1cb4c60..cc85913985 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TIndex.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 1f10f853e9..8a6620c900 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TIndexColumns.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index b4ae00b603..0def1f0092 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TIndexes.cxx,v $
- * $Revision: 1.12.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 5f7605c255..8c7ce10c7e 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKey.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 1c0be35d9d..8c55f6e628 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKeyColumns.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 1875c3e283..5f94c33a87 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKeys.cxx,v $
- * $Revision: 1.13.30.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 2752aa4d4b..c91bbeab6d 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TPrivilegesResultSet.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 931beb7254..57a840acd2 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TSkipDeletedSet.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 5809d8e59e..d398df2bd2 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TSortIndex.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 9a150d4694..dc8e44b02d 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TTableHelper.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 30a6fe239b..3f7c53a807 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: conncleanup.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 70b4cc8758..da824e8b4b 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbcharset.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index d2682adf7b..6149b4748c 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbconversion.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index abf83ac7c9..fff8b0c756 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbexception.cxx,v $
- * $Revision: 1.23.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 5e07514624..c196e37289 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbmetadata.cxx,v $
- * $Revision: 1.10.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index eaf1d6fe8e..f3d00471af 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtools.cxx,v $
- * $Revision: 1.74.46.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 86a7f1e601..de9e63d9f3 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtools2.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 4091f9088d..bab2ec4ed1 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtermanager.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index c809892cc4..ea5a7ee867 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formattedcolumnvalue.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index cb5a4ad3f7..34acd9a819 100644
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.35 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 9114f20e12..ac2446b223 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parameters.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 36b20b7f50..cef4508e3b 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paramwrapper.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 94d269955b..789dd7dfbc 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: predicateinput.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 0ca98181cc..81c0c26925 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyids.cxx,v $
- * $Revision: 1.7.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 0b8710c495..a042847998 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlerror.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index dfb02c33f5..0996eaaaaf 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statementcomposer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index f2c8156e0c..91890e8149 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: warnings.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index d40aeccda0..fd6dc91edf 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZConnectionPool.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 7ccc9cd5bf..318f3cd68a 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZConnectionPool.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index 94ea1be0be..05ae1b951d 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZConnectionWrapper.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 85f8ee9677..9566586122 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZConnectionWrapper.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 61509638c6..3ca39e60d9 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZDriverWrapper.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index cb56638035..5a0727fe5e 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZDriverWrapper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 679ea8d611..b5749e664d 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZPoolCollection.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index ddef9e317f..2175642e1e 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZPoolCollection.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 64293811d5..ac7bafdefa 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZPooledConnection.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 17c272ea84..a0764c4907 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZPooledConnection.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 4cf9705d97..3e78da1054 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Zregistration.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 056e5c1617..183db228e8 100644
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 060ff6c554..1e7f9b0b75 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx
index 22fbe61f4f..cdae71a0a3 100644
--- a/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/connectivity/source/drivers/adabas/BCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BCatalog.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index f36b27cb3c..1a93c69b7d 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BColumns.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 151b886fd7..fe0d9336d6 100644
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BConnection.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index f448a97140..39c0106262 100644
--- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BDatabaseMetaData.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index bcdd09cb7e..c2b7889c07 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BDriver.cxx,v $
- * $Revision: 1.24.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index d805241bb7..3aade60b4f 100644
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BFunctions.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 8dc7c2f1e3..3b3d5e4afe 100644
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BGroup.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index 49afc6e3a8..f0416ccaf7 100644
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BGroups.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx
index 4834f6af50..c2395825ee 100644
--- a/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/connectivity/source/drivers/adabas/BIndex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndex.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 26b94897f2..5ace30cb65 100644
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndexColumns.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index 89bfeae5ec..4adf1160d2 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndexes.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 2d5ff14759..2f4a927853 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BKeys.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index 3b398c8044..fb66df7d35 100644
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BPreparedStatement.cxx,v $
- * $Revision: 1.9.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx
index 8ec829303a..08775ef698 100644
--- a/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/connectivity/source/drivers/adabas/BResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BResultSet.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index 210ec76b56..fd076faa29 100644
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BResultSetMetaData.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx
index f58cebfa3e..bec6ab4d05 100644
--- a/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/connectivity/source/drivers/adabas/BStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BStatement.cxx,v $
- * $Revision: 1.9.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index bfd598929c..224c37aa70 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BTable.cxx,v $
- * $Revision: 1.36.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index 0d16aeba65..6da0b1830b 100644
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BTables.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index a672cf906e..c1bdd8c492 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BUser.cxx,v $
- * $Revision: 1.17.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index 6062b63854..d997d2687c 100644
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BUsers.cxx,v $
- * $Revision: 1.19.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index b62f0d12ca..b4ca7830ce 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BViews.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index fd70bcb2a1..bcaf878217 100644
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Bservices.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/adabas.xcu b/connectivity/source/drivers/adabas/adabas.xcu
index e20ef1d3f7..20c811bd2d 100755..100644
--- a/connectivity/source/drivers/adabas/adabas.xcu
+++ b/connectivity/source/drivers/adabas/adabas.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index 5b3483ed57..ed81b9a321 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.30 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 6f15fdba76..f27111a0db 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ACallableStatement.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index 7c01de3732..bc7b1f4869 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ACatalog.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 9b25535c31..069e7a96a9 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AColumn.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 4889a256f2..cd50e158b1 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AColumns.cxx,v $
- * $Revision: 1.22.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 4193a6985f..55b55bc303 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AConnection.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index cd4538d834..aa38e5d12a 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaData.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 1480b52fd4..3a1d4bbb31 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaDataImpl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 783707b8e0..5f9b98831f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 6a9d640b91..430fba9e95 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaDataResultSetMetaData.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 6ff8dedcf7..20eb6910f8 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADriver.cxx,v $
- * $Revision: 1.19.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 2cd579f7d9..ac51683b51 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AGroup.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 5e366825f1..f5732ca16c 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AGroups.cxx,v $
- * $Revision: 1.12.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 0e49c6e8e6..a55498494e 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AIndex.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 0246348e58..a076d81bd6 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AIndexes.cxx,v $
- * $Revision: 1.17.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 129705426f..f053b4a83f 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKey.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx
index 3e5773bdef..b2c64d76bd 100644
--- a/connectivity/source/drivers/ado/AKeyColumn.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKeyColumn.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx
index aa293ca0a5..70261751cc 100644
--- a/connectivity/source/drivers/ado/AKeyColumns.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKeyColumns.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index abe6bb3113..b40633b717 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKeys.cxx,v $
- * $Revision: 1.20.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 3958f2e843..969a7e6d84 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: APreparedStatement.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 10295db9a4..d3e2d08c31 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AResultSet.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 071172d77e..5fbd10b2af 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AResultSetMetaData.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 2c95b70914..8585a445ad 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.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: AStatement.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index 96a5bc38b7..b98417284d 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ATable.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 384607bdef..d64fcb9405 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ATables.cxx,v $
- * $Revision: 1.21.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 1bf8da983f..c865ac737a 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AUser.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index bf66d1d6f8..f3877af922 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AUsers.cxx,v $
- * $Revision: 1.12.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 98c5d5a333..6a3392b796 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AView.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index ed95efea6c..350daef0cb 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AViews.cxx,v $
- * $Revision: 1.17.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 650c77a244..255ff04e42 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Aolevariant.cxx,v $
- * $Revision: 1.15.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 00ae2a249b..8f31a964f2 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Aservices.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 155e4a0fed..3d594897c5 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Awrapado.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index fe4596f19e..333040e711 100755..100644
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/drivers/ado/ado_post_sys_include.h
index 5ce4beade1..a368593027 100644
--- a/connectivity/source/drivers/ado/ado_post_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_post_sys_include.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ado_post_sys_include.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h
index fd1617d99e..6eee7ab094 100644
--- a/connectivity/source/drivers/ado/ado_pre_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ado_pre_sys_include.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index cd89c61711..3c9d501f82 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: adoimp.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index b453c528e1..1ace132b96 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index b26beb6c5c..e46d2c82d7 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CCatalog.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 266d458b92..394302c2ae 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CColumns.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index a515c9ddb3..0c98cd8104 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CConnection.cxx,v $
- * $Revision: 1.18.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index b89a2bfc5a..3af62948db 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CDatabaseMetaData.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 937cdc542e..f3ae81ad66 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CDriver.cxx,v $
- * $Revision: 1.9.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index 83fc3d7731..46f5b8342a 100644
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CPreparedStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index e9a977ccc9..f645d65bd2 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CResultSet.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index c8b6d957c6..95eece44dd 100644
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index f108815a10..f4a5bd269c 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CTable.cxx,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 77057abd11..203d949d0e 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CTables.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index c80fc28bbc..5c82731a77 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Cservices.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/calc.xcu b/connectivity/source/drivers/calc/calc.xcu
index 5ca6c81b60..661baf4b4f 100755..100644
--- a/connectivity/source/drivers/calc/calc.xcu
+++ b/connectivity/source/drivers/calc/calc.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 620bcd6a8e..dbc566e4c8 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index c402bf7642..0935e492ff 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DCatalog.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 2291db703d..5b933090eb 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DCode.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index e5ccfd669f..8011bdbbae 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DColumns.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index 49bb15fe5e..8a2516680c 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DConnection.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 2cecb7bce8..a6e695239a 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DDatabaseMetaData.cxx,v $
- * $Revision: 1.35.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 3a2139bdb9..616d8a5f52 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DDriver.cxx,v $
- * $Revision: 1.11.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 9d25b18e00..5c3b10dab1 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndex.cxx,v $
- * $Revision: 1.43.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 305252cb71..59682a38d8 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexColumns.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 364d4daafc..6a6d2bf7dd 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexIter.cxx,v $
- * $Revision: 1.9.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index f494a04654..cffbc66a2b 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexes.cxx,v $
- * $Revision: 1.18.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 3554efc4d2..828dd46dc6 100644
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DNoException.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 70554ef19a..42bfff750e 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DPreparedStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 0182f152b0..cbb26f292f 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DResultSet.cxx,v $
- * $Revision: 1.25.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index c4e48b1966..f65cfabe0d 100644
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 216dc2d9fc..a913db1cf1 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DTable.cxx,v $
- * $Revision: 1.107.30.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 988a98f0bd..76c5c9faa4 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DTables.cxx,v $
- * $Revision: 1.27.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 62beb8f828..655eb5f5be 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Dservices.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/dbase.xcu b/connectivity/source/drivers/dbase/dbase.xcu
index 4c8a0413ef..5e6e7596c3 100755..100644
--- a/connectivity/source/drivers/dbase/dbase.xcu
+++ b/connectivity/source/drivers/dbase/dbase.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index f8bf4dd7b4..49b9e04def 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dindexnode.cxx,v $
- * $Revision: 1.21.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 37a88ef476..4b9a5803ec 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.28 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index eda89dd6f8..cffc1e4363 100644
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LCatalog.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
index 92d78d44b8..a6b4aa9f61 100644
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ b/connectivity/source/drivers/evoab/LCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LCatalog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index c59404389c..f8fbc2f8e9 100644
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LColumnAlias.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
index 3803a39be5..786f8fc3d0 100644
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LColumnAlias.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index 4837c1406b..e616b8b932 100644
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LColumns.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
index 865d4500f4..2fe90cc98d 100644
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ b/connectivity/source/drivers/evoab/LColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index a7441cb0da..f2c3050613 100644
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LConfigAccess.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx
index 883af23001..319e5a31fd 100644
--- a/connectivity/source/drivers/evoab/LConfigAccess.hxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LConfigAccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 60107d6dbb..97a380ac62 100644
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LConnection.cxx,v $
- * $Revision: 1.12.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx
index 05191d923a..1f7e54d715 100644
--- a/connectivity/source/drivers/evoab/LConnection.hxx
+++ b/connectivity/source/drivers/evoab/LConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LConnection.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index fbcf6826e3..db447e0059 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDatabaseMetaData.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
index 7e60ece946..92d70cdbf6 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDatabaseMetaData.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx
index 0d0fd4ea8f..3442d1a098 100644
--- a/connectivity/source/drivers/evoab/LDebug.cxx
+++ b/connectivity/source/drivers/evoab/LDebug.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDebug.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx
index 10138f73e8..7ce925a3bd 100644
--- a/connectivity/source/drivers/evoab/LDebug.hxx
+++ b/connectivity/source/drivers/evoab/LDebug.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDebug.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index bc11ee5395..08907f0adb 100644
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDriver.cxx,v $
- * $Revision: 1.10.42.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index b3c5df824d..3e82c6091c 100644
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDriver.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 577d950ca6..662e61f23f 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LFolderList.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index 690c3bb140..74b406c3c9 100644
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LFolderList.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index b1cd94cd86..fc4c108cdc 100644
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LNoException.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
index c2f010d415..028b26cb37 100644
--- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LPreparedStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
index 5fa43b72d0..98ababa5e0 100644
--- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LPreparedStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 2caecef296..9db4359ef3 100644
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LResultSet.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx
index a9506ac267..17dd2d0e98 100644
--- a/connectivity/source/drivers/evoab/LResultSet.hxx
+++ b/connectivity/source/drivers/evoab/LResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LResultSet.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index 7993ca1691..bd17e4742d 100644
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LServices.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx
index b71df43747..aacd54a590 100644
--- a/connectivity/source/drivers/evoab/LStatement.cxx
+++ b/connectivity/source/drivers/evoab/LStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx
index 0d2c26b7f3..1e3b7fd6d1 100644
--- a/connectivity/source/drivers/evoab/LStatement.hxx
+++ b/connectivity/source/drivers/evoab/LStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 47e8368694..6b1a93e10a 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LTable.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx
index 20a65dba16..a1a4c98543 100644
--- a/connectivity/source/drivers/evoab/LTable.hxx
+++ b/connectivity/source/drivers/evoab/LTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LTable.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index 11ece8210a..c25d3ca205 100644
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LTables.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx
index 656607193d..6180493db4 100644
--- a/connectivity/source/drivers/evoab/LTables.hxx
+++ b/connectivity/source/drivers/evoab/LTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LTables.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/evoab.xcu b/connectivity/source/drivers/evoab/evoab.xcu
index 947c639bc6..c54c9856ca 100755..100644
--- a/connectivity/source/drivers/evoab/evoab.xcu
+++ b/connectivity/source/drivers/evoab/evoab.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 8982322513..3aa7b742e0 100644
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index 767bfdb3c5..e863939e93 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EApi.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h
index 9ed2a42598..b0bc9abeb6 100644
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EApi.h,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index 71e11c240f..17ee5238b6 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NCatalog.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index 48f54f9a0e..c70fc9e934 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NCatalog.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 88f14cfcf5..ddad36e522 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NColumns.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index c68f4a436d..fad06a23ce 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NColumns.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 1f4d4a10dc..0f95aebb75 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NConnection.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 241109c08a..56e574b36d 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NConnection.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 879d52a2d9..cdb615b026 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 85050216d8..956d2656ac 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx
index 3371b4fd53..58db555c6f 100644
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/connectivity/source/drivers/evoab2/NDebug.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NDebug.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx
index 3e7b77c4a2..0a09afdd89 100644
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ b/connectivity/source/drivers/evoab2/NDebug.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NDebug.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 2324ec7a7d..17b58f6518 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NDriver.cxx,v $
- * $Revision: 1.6.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 9a8bb60f3f..2fa5fd689c 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NDriver.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 3efcdc740e..8259de5d47 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -2,7 +2,7 @@
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index 965d9f2022..9e10e82f45 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -2,7 +2,7 @@
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index c7e6a1617d..f7d39fc8d7 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -2,7 +2,7 @@
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 3fbd7a730d..b1cff2e7d6 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NResultSet.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 390d607a92..769ea10614 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 2ead27743d..98b09d7413 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NResultSetMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 8a38bc4689..adea435294 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 120ceb5248..113f157154 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -2,7 +2,7 @@
  *
  * 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
  *
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index b89973efa7..4759f77553 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.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: NStatement.hxx,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/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 7ffb161d2f..04881536e1 100644
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NTable.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx
index 84ecfed7ad..52de27d6c6 100644
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NTable.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 0109d9f126..e7129f0ec2 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NTables.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index dc3a8b268c..6c3db65adc 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NTables.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/evoab2.xcu b/connectivity/source/drivers/evoab2/evoab2.xcu
index e1adbab087..244fe623bc 100755..100644
--- a/connectivity/source/drivers/evoab2/evoab2.xcu
+++ b/connectivity/source/drivers/evoab2/evoab2.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index e9bb9fdc4d..9e1d42587e 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -1,8 +1,8 @@
 #*************************************************************************
 #
 # 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
 #
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 8dba811f7a..47bf756d77 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FCatalog.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 2b5fd63ab8..7c70d4c437 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FColumns.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 1894e34d91..6d5bb0345f 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FConnection.cxx,v $
- * $Revision: 1.51.30.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index d4a8b0d196..9a0f248b11 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaData.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index 337bc5e99b..5b19050744 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDateFunctions.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 399ac16105..d0d952e9ba 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDriver.cxx,v $
- * $Revision: 1.14.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 89fe915c4c..3ed13d15af 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FNoException.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 84e5ca0809..4d3644d0eb 100644
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FNumericFunctions.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 914dddc59e..f5b2de4ef1 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPreparedStatement.cxx,v $
- * $Revision: 1.42.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 2a373922d6..00e16271bd 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FResultSet.cxx,v $
- * $Revision: 1.102.30.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 6c8f899575..387b8450a4 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FResultSetMetaData.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 6d82486dae..efb77f6355 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FStatement.cxx,v $
- * $Revision: 1.44.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index c5a9429340..d7326b9b73 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FStringFunctions.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 5f975fd0c3..8e4989db42 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FTable.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index b9233eb8b0..15c444bbb6 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FTables.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 0755988258..d7931cfc8c 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fanalyzer.cxx,v $
- * $Revision: 1.26.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 1793cf58e3..ee35b984de 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fcode.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 81c4fc052c..6ad706b71f 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fcomp.cxx,v $
- * $Revision: 1.30.30.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index b2a3097c40..778f781478 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.18 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index e35c3c0caf..f8305760b4 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: quotedstring.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 8a2699c66e..2e498cc45b 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ECatalog.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index cf782340dd..29ac131dd2 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EColumns.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 7f531bf41d..f95a3e4932 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EConnection.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 0edb3cd569..a20b8e5ecb 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EDatabaseMetaData.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index b493c53aad..9aab07bee7 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EDriver.cxx,v $
- * $Revision: 1.10.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 02d02e9f67..2ddead6acf 100644
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EPreparedStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index f88467cb08..467ea0609a 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EResultSet.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index ec1da9f3cb..e3dfcd686a 100644
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EStatement.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 7fbc472586..71f657034d 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ETable.cxx,v $
- * $Revision: 1.62 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index c0a1b0819b..d16a1135bd 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ETables.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 67ff8afbe3..ba416a0c19 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Eservices.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/flat.xcu b/connectivity/source/drivers/flat/flat.xcu
index 6a22ed8662..d00d1f98c3 100755..100644
--- a/connectivity/source/drivers/flat/flat.xcu
+++ b/connectivity/source/drivers/flat/flat.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index d044eab279..52639b1060 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.20 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 6935030925..aca22ce338 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HCatalog.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index af044e3b04..6ff65b750a 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HColumns.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 37eda3922d..062503b257 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HConnection.cxx,v $
- * $Revision: 1.11.56.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index e00cb38da2..175200c8c3 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HDriver.cxx,v $
- * $Revision: 1.28.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx
index 8ed377d5cc..9b220e766a 100644
--- a/connectivity/source/drivers/hsqldb/HStorage.hxx
+++ b/connectivity/source/drivers/hsqldb/HStorage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HStorage.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index df209ff418..c98cb059e7 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HStorageAccess.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 712c38eea0..963aa9e7a8 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HStorageMap.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 8e6fc34b2c..11f01cad51 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTable.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 9b3c08aa28..b08f3af813 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTables.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 4af3fc4ce3..d731eb5797 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTerminateListener.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index fedf74a3ff..d83a122042 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTerminateListener.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 23eb183ac4..c5e31e5ef1 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTools.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 41a97c0942..61d7c1ea37 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HUser.cxx,v $
- * $Revision: 1.6.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index a0501ba9ec..ade64907a6 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HUsers.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index b16eabc31e..229e9c9218 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HView.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 9c20fc0404..64d811974a 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HViews.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index bf1d5829f1..10812a9864 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Hservices.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 6a43c9a86f..a95ee058d4 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageFileAccess.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 9eef51caa6..64246db630 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageNativeInputStream.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index a19aa44033..ec7428d14f 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageNativeOutputStream.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 73d341f49f..8ac77d5be4 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accesslog.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index e3f0655d60..524394a8b8 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accesslog.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xcu b/connectivity/source/drivers/hsqldb/hsqldb.xcu
index befa202f4c..a778566551 100755..100644
--- a/connectivity/source/drivers/hsqldb/hsqldb.xcu
+++ b/connectivity/source/drivers/hsqldb/hsqldb.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index 7d0108fc54..fe20ec5eaf 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hsqlui.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 027bfdeaeb..440b0918a8 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hsqlui.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index c61e4b297b..b1a4b16427 100644
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 10f1ebd4f7..11ce7cec21 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Array.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index e94e50ebf3..4faf0915d3 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Blob.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 4e17033cee..2192b33fae 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Boolean.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 8167c0ee8a..76aa783fb4 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CallableStatement.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index 0349e79303..0207c14dd5 100644
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Class.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index c3c53d5809..1d9aaf2419 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Clob.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 531cc308f9..c15c5dc300 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConnectionLog.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 7a13c7ed96..e730f94e47 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ContextClassLoader.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 55c8b69838..e6af36ce4d 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DatabaseMetaData.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index fa2e48d087..41fd269617 100644
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Date.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 5134ffd775..b45ae36b13 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DriverPropertyInfo.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 00029691ed..da6ceb0b19 100644
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Exception.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 0236c7f350..2f07b9bf43 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: InputStream.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index c6809eb6cf..155ab5f694 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JBigDecimal.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index e2f1afcb77..edcb7719c9 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JConnection.cxx,v $
- * $Revision: 1.13.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index e1066776a5..09a9649f05 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JDriver.cxx,v $
- * $Revision: 1.43.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 7aa1750bb6..0d33c8637f 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JStatement.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index b8e8c87954..b3f948b3d1 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Object.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 62e12c42a5..81ec94b7ab 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PreparedStatement.cxx,v $
- * $Revision: 1.24.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 73e77a658b..a66c402c55 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Reader.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 18c8e3a434..eb9fc1e538 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Ref.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 8a5a9a22a0..3f5191af83 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResultSet.cxx,v $
- * $Revision: 1.36.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 6db88459b0..7783fdd5da 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResultSetMetaData.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 09b477b060..891bc16e71 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SQLException.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 516d743a4e..cf30b8b0e5 100644
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SQLWarning.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index f11e6684a6..e6102fc3a4 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: String.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index de6c3fe0a5..9bbd81f62b 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Throwable.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 5a014d12a5..d052e45560 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Timestamp.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/jdbc.xcu b/connectivity/source/drivers/jdbc/jdbc.xcu
index 7a64519e48..c3e9220a55 100755..100644
--- a/connectivity/source/drivers/jdbc/jdbc.xcu
+++ b/connectivity/source/drivers/jdbc/jdbc.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 2f9875b6ec..f7b923c52f 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jservices.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 831a6755af..4e59961671 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.24 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index 8a3ca446dc..133840f55f 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tools.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index a86eba5ab2..c404158063 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KCatalog.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index ead590a28d..9031564769 100644
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KCatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index 866c53d5c5..5b6b9a4447 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KColumns.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index c7179a7b29..1ba5d324c0 100644
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KColumns.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index ac381db10b..0ce41a4ef4 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KConnection.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index fde955d2f1..28bd135e26 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KConnection.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 813e79081a..30525f2e86 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KDEInit.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index feb57a3b58..0f169254f1 100644
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KDEInit.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 3d40b25951..4078a824ca 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KDatabaseMetaData.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 5801980f03..9c0ed5e64b 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KDatabaseMetaData.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 59398f2c14..72753f1066 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KDriver.cxx,v $
- * $Revision: 1.10.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index 049381a9e4..19d8115bdd 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KDriver.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index f26b06d120..0b7e2b3406 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KPreparedStatement.cxx,v $
- * $Revision: 1.6.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index 65466545d9..5b29f20aea 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KPreparedStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 91ef3f6cae..6b91e7136d 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KResultSet.cxx,v $
- * $Revision: 1.9.46.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index c0d7e2c9a6..b0b25374b0 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KResultSet.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 89175ade1a..c36b166b2a 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KResultSetMetaData.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index d01d62cd9b..bcb5060c6e 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KResultSetMetaData.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index afbb97a970..3cee9675fc 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KServices.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index d612b77976..b7d86e6155 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KStatement.cxx,v $
- * $Revision: 1.8.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index 7f6dc9adc2..eae275297b 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index b529eaea1a..f441cdf9dc 100644
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KTable.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx
index fa9849f3e1..5067fee4ee 100644
--- a/connectivity/source/drivers/kab/KTable.hxx
+++ b/connectivity/source/drivers/kab/KTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KTable.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 82131b8538..418f7a1dd6 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KTables.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index 0dd0901de6..aaa0600275 100644
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KTables.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/kab.xcu b/connectivity/source/drivers/kab/kab.xcu
index c4bb50bb83..d350014a30 100755..100644
--- a/connectivity/source/drivers/kab/kab.xcu
+++ b/connectivity/source/drivers/kab/kab.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index 0bcf5f9dcc..3df690baeb 100644
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kcondition.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index d22c09ce96..890dd89826 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kcondition.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index 6e5eaa378b..861cbb440f 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kfields.cxx,v $
- * $Revision: 1.5.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index e6e3efda73..c3e7264d7e 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kfields.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index 35c0cddd43..0df6b66bab 100644
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: korder.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index b5b2b6acf3..126e827755 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: korder.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 2c0a86f856..07f44f2972 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.56.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 3305675c7a..aafe25152c 100755..100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabAddressBook.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index 8360d57f2c..4e3a245fbf 100755..100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabAddressBook.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 17b8e014cf..6dd7f0a611 100755..100644
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabCatalog.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index a73e7b83d9..41811d88d4 100755..100644
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabCatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 3a80439ee9..a2e99a81c2 100755..100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabColumns.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
index f21d63908b..bca77545a6 100755..100644
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabColumns.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index e70a5a7f56..8d3bdf6ff5 100755..100644
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabConnection.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 437bbfddfd..fb5bb20621 100755..100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabConnection.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 95cf98cbd4..418f0621e9 100755..100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabDatabaseMetaData.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 48d779623f..a6b65011cd 100755..100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabDatabaseMetaData.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 46b8ffcbe5..77823da25a 100755..100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabDriver.cxx,v $
- * $Revision: 1.4.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 030b57b246..64b6819331 100755..100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabDriver.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index 48d6163173..e39034df3f 100644
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabGroup.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx
index a252d4cd6b..5ce522dffc 100644
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabGroup.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 2efd06665d..77e0b20f94 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabHeader.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index ba9248025e..ae7de481ab 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabHeader.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 3f15250961..148450ff17 100755..100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabPreparedStatement.cxx,v $
- * $Revision: 1.3.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index 75330436f7..ede564f165 100755..100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabPreparedStatement.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index 8b019726b6..c52bd52123 100755..100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabRecord.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
index 72029582d0..c1327e823b 100755..100644
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabRecord.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 4d5c64b51d..d7074f1ca0 100755..100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabRecords.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index 8e5d9c3ab2..1cbb20e808 100755..100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabRecords.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 5a5d660c60..41d4f1a5c9 100755..100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabResultSet.cxx,v $
- * $Revision: 1.3.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 37af9507c2..f59663ccb4 100755..100644
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabResultSet.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 60bdcdcc13..72729a5950 100755..100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabResultSetMetaData.cxx,v $
- * $Revision: 1.3.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index 4ce92a77d4..6abd7caefa 100755..100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabResultSetMetaData.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 4541df29b9..84cdb27d5c 100755..100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabServices.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 29c8477234..70b9f7d3a4 100755..100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabStatement.cxx,v $
- * $Revision: 1.3.56.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 6d2966a60c..59cb48f540 100755..100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabStatement.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index 0b40917851..9ce2952776 100755..100644
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabTable.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index 8b8bc955c3..b4b690dd7e 100755..100644
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabTable.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 7fa211ad76..5f60109fcd 100755..100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabTables.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
index 01a309a624..5f2f1af294 100755..100644
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MacabTables.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/macab.xcu b/connectivity/source/drivers/macab/macab.xcu
index ead6b5fb23..7d4fa6df7d 100755..100644
--- a/connectivity/source/drivers/macab/macab.xcu
+++ b/connectivity/source/drivers/macab/macab.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 78771cdfe2..ec3ff2eb9f 100755..100644
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macabcondition.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 2a03483dc2..1e0f322aba 100755..100644
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macabcondition.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index 7cce344c95..bd14c007c5 100755..100644
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macaborder.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
index e46cd87497..df91d641ee 100755..100644
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macaborder.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 7d89e0aba0..0865cb5b21 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macabutilities.hxx,v $
- * $Revision: 1.3.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 8edc8951fa..376273b11a 100755..100644
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3.56.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index 0ac15a904e..8254b89787 100644
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MCatalog.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx
index ad9cef4818..edec901199 100644
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MCatalog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 3eb6d449bb..f1b04f9251 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MColumnAlias.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index e98a398a95..6653f38604 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MColumnAlias.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index 9e6df941e3..91016dbb1b 100644
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MColumns.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx
index 9d92cda829..3eb78117ca 100644
--- a/connectivity/source/drivers/mozab/MColumns.hxx
+++ b/connectivity/source/drivers/mozab/MColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 22d196e3c9..cf82634960 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MConfigAccess.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx
index 15fab613fb..0290c93716 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MConfigAccess.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index f84b150e86..1b3b495d7f 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MConnection.cxx,v $
- * $Revision: 1.28.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 9fcaa1b126..9994d8bee2 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MConnection.hxx,v $
- * $Revision: 1.18.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,18 +27,18 @@
 #ifndef CONNECTIVITY_SCONNECTION_HXX
 #define CONNECTIVITY_SCONNECTION_HXX
 
-#include "connectivity/CommonTools.hxx"

-

-#include "MCatalog.hxx"

+#include "connectivity/CommonTools.hxx"
+
+#include "MCatalog.hxx"
 #include "MColumnAlias.hxx"
-#include "OSubComponent.hxx"

-#include "TConnection.hxx"

+#include "OSubComponent.hxx"
+#include "TConnection.hxx"
 
-#include <com/sun/star/beans/PropertyValue.hpp>

-#include <com/sun/star/mozilla/MozillaProductType.hpp>

+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/mozilla/MozillaProductType.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-

+
 #include <cppuhelper/weakref.hxx>
 
 #include <memory>
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index ecfe0ea9c3..f0b21f5dd6 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MDatabaseMetaData.cxx,v $
- * $Revision: 1.16.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
index 32cbec4b1e..4ea0dcab1c 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MDatabaseMetaData.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 340e6ed385..51d71bc17c 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MDriver.cxx,v $
- * $Revision: 1.19.56.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index d7f68ff7bc..7e395180d4 100644
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MDriver.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
index d2303ede6c..2292831dc3 100644
--- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MExtConfigAccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index 07e7551a8a..16019f0cf5 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MPreparedStatement.cxx,v $
- * $Revision: 1.14.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index d1d835c5ac..e044569846 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MPreparedStatement.hxx,v $
- * $Revision: 1.8.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 081ff8369f..54dc361dcb 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MResultSet.cxx,v $
- * $Revision: 1.33.22.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index d93a723213..598535c9ae 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MResultSet.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index a4d468d795..6bfebda8a2 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MResultSetMetaData.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index e525ad3599..686c9c50b2 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MResultSetMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 212becb2b9..13bdae6040 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MServices.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 19f32d0cb5..72922a37cc 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MStatement.cxx,v $
- * $Revision: 1.18.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 97ae08aa70..2b9d12036c 100644
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MStatement.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx
index 29aadaac50..1b55ef7e33 100644
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MTable.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx
index f2e928f085..ad33a6c227 100644
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MTable.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index c6bac0f566..52724c70df 100644
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MTables.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx
index 8d6eb5a419..664bc54356 100644
--- a/connectivity/source/drivers/mozab/MTables.hxx
+++ b/connectivity/source/drivers/mozab/MTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MTables.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index d504f75224..0701451cf8 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MMozillaBootstrap.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 7f0f8be410..df0762897d 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MMozillaBootstrap.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 973ae1ddff..bc1933cf3b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSFolders.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index 1bc4b9c2c2..d69a5e3435 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSFolders.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index dc422f3cfa..d30d588267 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSINIParser.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 7a556d9a1e..63263a2cc8 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSINIParser.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index f929108dd1..11abccd9c1 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSInit.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index deccb2f398..22d40cf737 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSInit.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index f33cc519b9..6027bdb120 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfile.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
index 64614a666d..cc3b1ea59a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfile.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index 370b02cc1c..2ca0cab4f5 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfileDirServiceProvider.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
index 803234b4ba..c9f00c3249 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfileDirServiceProvider.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 26fab98748..b85e2e0892 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfileDiscover.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 8ae8b1caab..1f840123c6 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfileDiscover.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
index 67d405915e..1e513a7315 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfileManager.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 0f0bc24f40..b61dae1f5f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSProfileManager.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index fce47b0d26..9b0ba976c3 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSRunnable.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index a1c994a3f9..d0e9e9c263 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSRunnable.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 9b4b05868c..6c14aec149 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index 75614c952e..f936167438 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozilla_nsinit.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 7733dd9add..4486add097 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozilla_nsprofile.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index 7e973769d2..2970155a40 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozilla_nsprofiledirserviceprovider.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index ac1d351937..3a63d3142f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozilla_profile_discover.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 61d90e1d34..539baec0f6 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozilla_profilemanager.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
index 640c59e123..cd586ce0f5 100644
--- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: post_include_windows.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
index e60182e112..6ff8de285a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pre_include_windows.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 677e605096..c599bbcbe4 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.28 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/mozab/mozab.xcu b/connectivity/source/drivers/mozab/mozab.xcu
index 7d3b78e3fe..895b7670c3 100755..100644
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozab2.xcu b/connectivity/source/drivers/mozab/mozab2.xcu
index 33e0bebcd4..e7c24143f5 100755..100644
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index f7e8d7750b..cf0bd667b3 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MDatabaseMetaDataHelper.cxx,v $
- * $Revision: 1.16.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 48ffc83ef8..c78b6f9a9a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MDatabaseMetaDataHelper.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
index 04f276e70e..5e975087bc 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MErrorResource.hxx,v $
- * $Revision: 1.3.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index ba6abb3f17..73c3fb1690 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -1,32 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
 
@@ -92,44 +89,44 @@ namespace connectivity { namespace mozab {
                     CardPropertySetter  PropSetter;
                 };
                 const MapEntry aEntries[] = {
-                    { "FirstName",          "givenname",                                    DEF_CARD_ACCESS( FirstName ) },

-                    { "LastName",           "sn,surnname",                                  DEF_CARD_ACCESS( LastName ) },

-                    { "DisplayName",        "cn,commonname,displayname",                    DEF_CARD_ACCESS( DisplayName ) },

-                    { "NickName",           "xmozillanickname",                             DEF_CARD_ACCESS( NickName ) },

-                    { "PrimaryEmail",       "mail",                                         DEF_CARD_ACCESS( PrimaryEmail ) },

-                    { "SecondEmail",        "xmozillasecondemail",                          DEF_CARD_ACCESS( SecondEmail ) },

-                    { "WorkPhone",          "telephonenumber",                              DEF_CARD_ACCESS( WorkPhone ) },

-                    { "HomePhone",          "homephone",                                    DEF_CARD_ACCESS( HomePhone ) },

-                    { "FaxNumber",          "fax,facsimiletelephonenumber",                 DEF_CARD_ACCESS( FaxNumber ) },

-                    { "PagerNumber",        "pager,pagerphone",                             DEF_CARD_ACCESS( PagerNumber ) },

-                    { "CellularNumber",     "mobile,cellphone,carphone",                    DEF_CARD_ACCESS( CellularNumber ) },

-                    { "HomeAddress",        "homepostaladdress,mozillaHomeStreet",          DEF_CARD_ACCESS( HomeAddress ) },

-                    { "HomeAddress2",       "mozillaHomeStreet2",                           DEF_CARD_ACCESS( HomeAddress2 ) },

-                    { "HomeCity",           "homelocality,mozillaHomeLocalityName",         DEF_CARD_ACCESS( HomeCity ) },

-                    { "HomeState",          "homeregion,mozillaHomeState",                  DEF_CARD_ACCESS( HomeState ) },

-                    { "HomeZipCode",        "homepostalcode,mozillaHomePostalCode",         DEF_CARD_ACCESS( HomeZipCode ) },

-                    { "HomeCountry",        "homecountryname,mozillaHomeCountryName",       DEF_CARD_ACCESS( HomeCountry ) },

-                    { "WorkAddress",        "postofficebox,streetaddress,streetaddress1",   DEF_CARD_ACCESS( WorkAddress ) },

-                    { "WorkAddress2",       "streetaddress2",                               DEF_CARD_ACCESS( WorkAddress2 ) },

-                    { "WorkCity",           "l,locality",                                   DEF_CARD_ACCESS( WorkCity ) },

-                    { "WorkState",          "st,region",                                    DEF_CARD_ACCESS( WorkState ) },

-                    { "WorkZipCode",        "postalcode,zip",                               DEF_CARD_ACCESS( WorkZipCode ) },

-                    { "WorkCountry",        "countryname",                                  DEF_CARD_ACCESS( WorkCountry ) },

-                    { "JobTitle",           "title",                                        DEF_CARD_ACCESS( JobTitle ) },

-                    { "Department",         "ou,orgunit,department,departmentnumber",       DEF_CARD_ACCESS( Department ) },

-                    { "Company",            "o,company",                                    DEF_CARD_ACCESS( Company ) },

-                    { "WebPage1",           "workurl",                                      DEF_CARD_ACCESS( WebPage1 ) },

-                    { "WebPage2",           "homeurl",                                      DEF_CARD_ACCESS( WebPage2 ) },

-                    { "BirthYear",          "birthyear",                                    DEF_CARD_ACCESS( BirthYear ) },

-                    { "BirthMonth",         "birthmonth",                                   DEF_CARD_ACCESS( BirthMonth ) },

-                    { "BirthYear",          "birthday",                                     DEF_CARD_ACCESS( BirthDay ) },

-                    { "Custom1",            "custom1",                                      DEF_CARD_ACCESS( Custom1 ) },

-                    { "Custom2",            "custom2",                                      DEF_CARD_ACCESS( Custom2 ) },

-                    { "Custom3",            "custom3",                                      DEF_CARD_ACCESS( Custom3 ) },

-                    { "Custom4",            "custom4",                                      DEF_CARD_ACCESS( Custom4 ) },

-                    { "Notes",              "notes,description",                            DEF_CARD_ACCESS( Notes ) },

-                    { "PreferMailFormat",   "xmozillausehtmlmail",                          NULL, NULL },

-                    { NULL, NULL, NULL, NULL }

+                    { "FirstName",          "givenname",                                    DEF_CARD_ACCESS( FirstName ) },
+                    { "LastName",           "sn,surnname",                                  DEF_CARD_ACCESS( LastName ) },
+                    { "DisplayName",        "cn,commonname,displayname",                    DEF_CARD_ACCESS( DisplayName ) },
+                    { "NickName",           "xmozillanickname",                             DEF_CARD_ACCESS( NickName ) },
+                    { "PrimaryEmail",       "mail",                                         DEF_CARD_ACCESS( PrimaryEmail ) },
+                    { "SecondEmail",        "xmozillasecondemail",                          DEF_CARD_ACCESS( SecondEmail ) },
+                    { "WorkPhone",          "telephonenumber",                              DEF_CARD_ACCESS( WorkPhone ) },
+                    { "HomePhone",          "homephone",                                    DEF_CARD_ACCESS( HomePhone ) },
+                    { "FaxNumber",          "fax,facsimiletelephonenumber",                 DEF_CARD_ACCESS( FaxNumber ) },
+                    { "PagerNumber",        "pager,pagerphone",                             DEF_CARD_ACCESS( PagerNumber ) },
+                    { "CellularNumber",     "mobile,cellphone,carphone",                    DEF_CARD_ACCESS( CellularNumber ) },
+                    { "HomeAddress",        "homepostaladdress,mozillaHomeStreet",          DEF_CARD_ACCESS( HomeAddress ) },
+                    { "HomeAddress2",       "mozillaHomeStreet2",                           DEF_CARD_ACCESS( HomeAddress2 ) },
+                    { "HomeCity",           "homelocality,mozillaHomeLocalityName",         DEF_CARD_ACCESS( HomeCity ) },
+                    { "HomeState",          "homeregion,mozillaHomeState",                  DEF_CARD_ACCESS( HomeState ) },
+                    { "HomeZipCode",        "homepostalcode,mozillaHomePostalCode",         DEF_CARD_ACCESS( HomeZipCode ) },
+                    { "HomeCountry",        "homecountryname,mozillaHomeCountryName",       DEF_CARD_ACCESS( HomeCountry ) },
+                    { "WorkAddress",        "postofficebox,streetaddress,streetaddress1",   DEF_CARD_ACCESS( WorkAddress ) },
+                    { "WorkAddress2",       "streetaddress2",                               DEF_CARD_ACCESS( WorkAddress2 ) },
+                    { "WorkCity",           "l,locality",                                   DEF_CARD_ACCESS( WorkCity ) },
+                    { "WorkState",          "st,region",                                    DEF_CARD_ACCESS( WorkState ) },
+                    { "WorkZipCode",        "postalcode,zip",                               DEF_CARD_ACCESS( WorkZipCode ) },
+                    { "WorkCountry",        "countryname",                                  DEF_CARD_ACCESS( WorkCountry ) },
+                    { "JobTitle",           "title",                                        DEF_CARD_ACCESS( JobTitle ) },
+                    { "Department",         "ou,orgunit,department,departmentnumber",       DEF_CARD_ACCESS( Department ) },
+                    { "Company",            "o,company",                                    DEF_CARD_ACCESS( Company ) },
+                    { "WebPage1",           "workurl",                                      DEF_CARD_ACCESS( WebPage1 ) },
+                    { "WebPage2",           "homeurl",                                      DEF_CARD_ACCESS( WebPage2 ) },
+                    { "BirthYear",          "birthyear",                                    DEF_CARD_ACCESS( BirthYear ) },
+                    { "BirthMonth",         "birthmonth",                                   DEF_CARD_ACCESS( BirthMonth ) },
+                    { "BirthYear",          "birthday",                                     DEF_CARD_ACCESS( BirthDay ) },
+                    { "Custom1",            "custom1",                                      DEF_CARD_ACCESS( Custom1 ) },
+                    { "Custom2",            "custom2",                                      DEF_CARD_ACCESS( Custom2 ) },
+                    { "Custom3",            "custom3",                                      DEF_CARD_ACCESS( Custom3 ) },
+                    { "Custom4",            "custom4",                                      DEF_CARD_ACCESS( Custom4 ) },
+                    { "Notes",              "notes,description",                            DEF_CARD_ACCESS( Notes ) },
+                    { "PreferMailFormat",   "xmozillausehtmlmail",                          NULL, NULL },
+                    { NULL, NULL, NULL, NULL }
                 };
                 const MapEntry* loop = aEntries;
                 while ( loop->pAsciiPropertyName )
@@ -141,8 +138,8 @@ namespace connectivity { namespace mozab {
             }
             return aMap;
         }
-    }

-

+    }
+
     //====================================================================
     //= AttributeMap_Data
     //====================================================================
@@ -168,120 +165,120 @@ namespace connectivity { namespace mozab {
     NS_IMPL_THREADSAFE_ISUPPORTS1( MLdapAttributeMap, nsIAbLDAPAttributeMap )
 
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval)

-    {

-        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );

-

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );

-

-        if ( pos == rPropertyMap.end() )

-        {

-            _retval.SetIsVoid( PR_TRUE );

-        }

-        else

-        {

-            MTypeConverter::asciiToNsACString( pos->second.pLDAPAttributeList, _retval );

-        }

-

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval)
+    {
+        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
+
+        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
+        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );
+
+        if ( pos == rPropertyMap.end() )
+        {
+            _retval.SetIsVoid( PR_TRUE );
+        }
+        else
+        {
+            MTypeConverter::asciiToNsACString( pos->second.pLDAPAttributeList, _retval );
+        }
+
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::GetAttributes: not implemented!" );

-        (void)aProperty;

-        (void)aCount;

-        (void)aAttrs;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::GetAttributes: not implemented!" );
+        (void)aProperty;
+        (void)aCount;
+        (void)aAttrs;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval)

-    {

-        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );

-

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );

-

-        if ( pos == rPropertyMap.end() )

-        {

-            _retval.SetIsVoid( PR_TRUE );

-        }

-        else

-        {

-            sal_Int32 tokenPos(0);

-            ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList );

-            MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval );

-        }

-

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval)
+    {
+        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
+
+        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
+        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );
+
+        if ( pos == rPropertyMap.end() )
+        {
+            _retval.SetIsVoid( PR_TRUE );
+        }
+        else
+        {
+            sal_Int32 tokenPos(0);
+            ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList );
+            MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval );
+        }
+
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::SetAttributeList: not implemented!" );

-        (void)aProperty;

-        (void)aAttributeList;

-        (void)allowInconsistencies;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::SetAttributeList: not implemented!" );
+        (void)aProperty;
+        (void)aAttributeList;
+        (void)allowInconsistencies;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::GetProperty: not implemented!" );

-        (void)aAttribute;

-        (void)_retval;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::GetProperty: not implemented!" );
+        (void)aAttribute;
+        (void)_retval;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval)

-    {

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-

-        ::rtl::OStringBuffer aAllAttributes;

-        for (   MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin();

-                loop != rPropertyMap.end();

-                ++loop

-            )

-        {

-            aAllAttributes.append( loop->second.pLDAPAttributeList );

-            if ( loop != rPropertyMap.end() )

-                aAllAttributes.append( ',' );

-        }

-

-        MTypeConverter::asciiToNsACString( aAllAttributes.getStr(), _retval );

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval)
+    {
+        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
+
+        ::rtl::OStringBuffer aAllAttributes;
+        for (   MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin();
+                loop != rPropertyMap.end();
+                ++loop
+            )
+        {
+            aAllAttributes.append( loop->second.pLDAPAttributeList );
+            if ( loop != rPropertyMap.end() )
+                aAllAttributes.append( ',' );
+        }
+
+        MTypeConverter::asciiToNsACString( aAllAttributes.getStr(), _retval );
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::CheckState(void)

-    {

-        // we do not allow modifying the map, so we're always in a valid state

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::CheckState(void)
+    {
+        // we do not allow modifying the map, so we're always in a valid state
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::SetFromPrefs: not implemented!" );

-        (void)aPrefBranchName;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::SetFromPrefs: not implemented!" );
+        (void)aPrefBranchName;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard)

-    {

-        NS_ENSURE_ARG_POINTER( aMessage );

-        NS_ENSURE_ARG_POINTER( aCard );

-

-        // in case that's not present in the LDAP message: set the "preferred mail format" to "none"

-        aCard->SetPreferMailFormat( nsIAbPreferMailFormat::unknown );

-

+    NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard)
+    {
+        NS_ENSURE_ARG_POINTER( aMessage );
+        NS_ENSURE_ARG_POINTER( aCard );
+
+        // in case that's not present in the LDAP message: set the "preferred mail format" to "none"
+        aCard->SetPreferMailFormat( nsIAbPreferMailFormat::unknown );
+
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         for (   MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin();
                 prop != rPropertyMap.end();
@@ -296,34 +293,34 @@ namespace connectivity { namespace mozab {
             while ( tokenPos != -1 )
             {
                 sAttribute = sAttributeList.getToken( 0, ',', tokenPos );
-

-                // retrieve the values for the current attribute

-                PRUint32 valueCount = 0;

-                PRUnichar** values = NULL;

-                nsresult rv = aMessage->GetValues( sAttribute.getStr(), &valueCount, &values );

-                if ( NS_FAILED( rv ) )

-                    // try the next attribute

-                    continue;

-

-                if ( valueCount )

-                {

-                    CardPropertySetter propSetter = prop->second.PropSetter;

-                    OSL_ENSURE( propSetter,

-                        "MLdapAttributeMap::SetCardPropertiesFromLDAPMessage: "

-                        "unexpected: could retrieve an attribute value, but have no setter for it!" );

-                    if ( propSetter )

-                    {

-                        (aCard->*propSetter)( values[0] );

-                    }

-

-                    // we're done with this property - no need to handle the remaining attributes which

-                    // map to it

-                    break;

-                }

+
+                // retrieve the values for the current attribute
+                PRUint32 valueCount = 0;
+                PRUnichar** values = NULL;
+                nsresult rv = aMessage->GetValues( sAttribute.getStr(), &valueCount, &values );
+                if ( NS_FAILED( rv ) )
+                    // try the next attribute
+                    continue;
+
+                if ( valueCount )
+                {
+                    CardPropertySetter propSetter = prop->second.PropSetter;
+                    OSL_ENSURE( propSetter,
+                        "MLdapAttributeMap::SetCardPropertiesFromLDAPMessage: "
+                        "unexpected: could retrieve an attribute value, but have no setter for it!" );
+                    if ( propSetter )
+                    {
+                        (aCard->*propSetter)( values[0] );
+                    }
+
+                    // we're done with this property - no need to handle the remaining attributes which
+                    // map to it
+                    break;
+                }
             }
-        }

-        return NS_OK;

-    }

+        }
+        return NS_OK;
+    }
 
     // -------------------------------------------------------------------
     namespace
@@ -362,10 +359,10 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     void MLdapAttributeMap::fillCardFromResult( nsIAbCard& _card, const MQueryHelperResultEntry& _result )
     {
-        _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown );

-

-        ::rtl::OUString resultValue;

-

+        _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown );
+
+        ::rtl::OUString resultValue;
+
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         for (   MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin();
                 prop != rPropertyMap.end();
@@ -374,16 +371,16 @@ namespace connectivity { namespace mozab {
         {
             resultValue = _result.getValue( prop->first );
 
-            CardPropertySetter propSetter = prop->second.PropSetter;

-            if ( propSetter )

-            {

-        // PRUnichar != sal_Unicode in mingw

-                (_card.*propSetter)( reinterpret_cast_mingw_only<const PRUnichar *>(resultValue.getStr()) );

-            }

-            else

-            {

-                if ( prop->first.equals( "PreferMailFormat" ) )

-                {

+            CardPropertySetter propSetter = prop->second.PropSetter;
+            if ( propSetter )
+            {
+        // PRUnichar != sal_Unicode in mingw
+                (_card.*propSetter)( reinterpret_cast_mingw_only<const PRUnichar *>(resultValue.getStr()) );
+            }
+            else
+            {
+                if ( prop->first.equals( "PreferMailFormat" ) )
+                {
                     unsigned int format = nsIAbPreferMailFormat::unknown;
                     const PreferMailFormatType* pMailFormatType = lcl_getMailFormatTypes();
                     while ( pMailFormatType->description )
@@ -396,10 +393,10 @@ namespace connectivity { namespace mozab {
                         ++pMailFormatType;
                     }
                     _card.SetPreferMailFormat(format);
-                }

-                else

-                    OSL_ENSURE( false, "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );

-            }

+                }
+                else
+                    OSL_ENSURE( false, "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );
+            }
         }
     }
 
@@ -415,18 +412,18 @@ namespace connectivity { namespace mozab {
                 ++prop
             )
         {
-            CardPropertyGetter propGetter = prop->second.PropGetter;

-            if ( propGetter )

-            {

-                (_card.*propGetter)( getter_Copies( value ) );

-

+            CardPropertyGetter propGetter = prop->second.PropGetter;
+            if ( propGetter )
+            {
+                (_card.*propGetter)( getter_Copies( value ) );
+
                 nsAutoString temp( value );
                 MTypeConverter::nsStringToOUString( temp, resultValue );
-            }

-            else

-            {

-                if ( prop->first.equals( "PreferMailFormat" ) )

-                {

+            }
+            else
+            {
+                if ( prop->first.equals( "PreferMailFormat" ) )
+                {
                     unsigned int format = nsIAbPreferMailFormat::unknown;
                     _card.GetPreferMailFormat( &format );
                     const PreferMailFormatType* pMailFormatType = lcl_getMailFormatTypes();
@@ -439,11 +436,11 @@ namespace connectivity { namespace mozab {
                         }
                         ++pMailFormatType;
                     }
-                }

-                else

-                    OSL_ENSURE( false, "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );

-            }

-

+                }
+                else
+                    OSL_ENSURE( false, "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );
+            }
+
             _result.insert( prop->first, resultValue );
         }
     }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index 80bd222f6a..043b0179ee 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
@@ -1,32 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 #ifndef CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
 #define CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
index 6941f85b23..7e3b6743b8 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSDeclares.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index 57eec5adb7..80a9bec5ad 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSInclude.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 42f0821d86..9ae0181d93 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSMozabProxy.cxx,v $
- * $Revision: 1.10.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index 3b6ccf94a1..c6f19724bf 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSMozabProxy.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index 9d5239b8e9..0138fe1df7 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSTerminateListener.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
index 792f246943..54fcd44f30 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNSTerminateListener.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index 3e8c63d467..f488c4c4f2 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNameMapper.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
index 167e8bdb7c..cfed0bc021 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MNameMapper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index f50ad7d4a8..33534979f0 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MQuery.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 685f8e3152..545d7c83ad 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MQuery.hxx,v $
- * $Revision: 1.16.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 08830ee3a1..74dc2f95ab 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MQueryHelper.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index a33fe7f5ca..a09a54c2fd 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MQueryHelper.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 43c6d38728..ae7f6f9ba5 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MTypeConverter.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index 9b2264ff57..7ecd2b2f4d 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MTypeConverter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index e31d4c7e41..a02c898c59 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.25 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index 544e927b6f..a257d54f30 100644
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: post_include_mozilla.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index 29da16b718..762d51160d 100644
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pre_include_mozilla.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 703cdc7b58..a42ab6b9ce 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YCatalog.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index efbabbe473..71ae5cd82c 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YColumns.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index a9ed1c9c8d..a862185b09 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YDriver.cxx,v $
- * $Revision: 1.20.30.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 8680ac2079..9ac5418347 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YTable.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 8b2626d612..2771e2bc02 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YTables.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index a79d486b9e..f3927b1252 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YUser.cxx,v $
- * $Revision: 1.6.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index 00786e4fd3..c1b23688f2 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YUsers.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 3a2e133421..928be012bc 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YViews.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index bea4162a69..2856697f89 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Yservices.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index 0d46f0c35d..4dbbcd040c 100644
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/mysql/mysql.xcu b/connectivity/source/drivers/mysql/mysql.xcu
index 7ea033d7e4..2fc59be5bd 100755..100644
--- a/connectivity/source/drivers/mysql/mysql.xcu
+++ b/connectivity/source/drivers/mysql/mysql.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 7a3cef288b..6eb4a2b335 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OFunctions.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index f99ce7a383..61a35a8ad2 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ORealDriver.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index beabeae1da..7815e3a9c9 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.4 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_OREALDRIVER_HXX
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index 8f37b6185d..27902e879a 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/drivers/odbc/odbc.xcu b/connectivity/source/drivers/odbc/odbc.xcu
index f906d08bdd..aa01cb458e 100755..100644
--- a/connectivity/source/drivers/odbc/odbc.xcu
+++ b/connectivity/source/drivers/odbc/odbc.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 0bd66dbe06..fd38d44978 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oservices.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 23fac14a35..994d8dd235 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OConnection.cxx,v $
- * $Revision: 1.45 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 97edeeffeb..7d64d7b2d5 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODatabaseMetaData.cxx,v $
- * $Revision: 1.35.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 20e705ba0e..2d2148e1da 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 4f1f2d4cca..015e63d960 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODriver.cxx,v $
- * $Revision: 1.18.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 187808bdbd..ddd2b00730 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OPreparedStatement.cxx,v $
- * $Revision: 1.49.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index e48cfe0259..d31f68c978 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OResultSet.cxx,v $
- * $Revision: 1.66 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 26fa1e13a0..db4538b76e 100644
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OResultSetMetaData.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 914363be48..622ce6a7b3 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OStatement.cxx,v $
- * $Revision: 1.40.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 9d8873c0d1..1124e03ca4 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -1,13 +1,10 @@
 /************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OTools.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 64ffd1f72f..932c309108 100644
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx
index 9f19338184..d734ac89bd 100644
--- a/connectivity/source/inc/AutoRetrievingBase.hxx
+++ b/connectivity/source/inc/AutoRetrievingBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoRetrievingBase.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index b42280117f..95eb4363df 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaDataResultSet.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index c640b19c08..1f6e1b5f6d 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaDataResultSetMetaData.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index e915df56df..5843885ca9 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OColumn.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
index dd6150f4eb..711268a552 100644
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/source/inc/OSubComponent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OSubComponent.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 5840322787..9c3641f94d 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OTypeInfo.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index 1fa59178df..6d8ba068a2 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index e966722a24..a2b198a8db 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RowFunctionParser.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 23923292bb..5b1ca8edbe 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TConnection.hxx,v $
- * $Revision: 1.13.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 3e6d151be5..8ef8d5a26b 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TDatabaseMetaDataBase.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 2432b9ff58..cd8e6f45f3 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TKeyValue.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx
index 34ee3a5b40..9f662130f2 100644
--- a/connectivity/source/inc/TPrivilegesResultSet.hxx
+++ b/connectivity/source/inc/TPrivilegesResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TPrivilegesResultSet.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx
index 642d3fff06..436e93c808 100644
--- a/connectivity/source/inc/TResultSetHelper.hxx
+++ b/connectivity/source/inc/TResultSetHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TResultSetHelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 0897440d9a..d4a9b4534f 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TSkipDeletedSet.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index e5614edbaa..33d2dc9771 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TSortIndex.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx
index 5aa4ceb134..de04659234 100644
--- a/connectivity/source/inc/UStringDescription_Impl.hxx
+++ b/connectivity/source/inc/UStringDescription_Impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UStringDescription_Impl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx
index fdfce1c0bc..264e0ad39c 100644
--- a/connectivity/source/inc/adabas/BCatalog.hxx
+++ b/connectivity/source/inc/adabas/BCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BCatalog.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx
index f153bee7f8..5284d62388 100644
--- a/connectivity/source/inc/adabas/BColumn.hxx
+++ b/connectivity/source/inc/adabas/BColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BColumn.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx
index b9ab2b0b58..761dcb6715 100644
--- a/connectivity/source/inc/adabas/BColumns.hxx
+++ b/connectivity/source/inc/adabas/BColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BColumns.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx
index dfc7f24806..f607c184d6 100644
--- a/connectivity/source/inc/adabas/BConnection.hxx
+++ b/connectivity/source/inc/adabas/BConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BConnection.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
index 3cf5961afc..bae7de19f4 100644
--- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
+++ b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BDatabaseMetaData.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 794c6122f6..56ca8f2f1e 100644
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BDriver.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx
index a2a38346b9..58358b579d 100644
--- a/connectivity/source/inc/adabas/BGroup.hxx
+++ b/connectivity/source/inc/adabas/BGroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BGroup.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx
index 97b3db5b58..62b5785114 100644
--- a/connectivity/source/inc/adabas/BGroups.hxx
+++ b/connectivity/source/inc/adabas/BGroups.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BGroups.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx
index 04e99e6c9a..187bb74508 100644
--- a/connectivity/source/inc/adabas/BIndex.hxx
+++ b/connectivity/source/inc/adabas/BIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndex.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx
index 48fc651c37..73e0b465ea 100644
--- a/connectivity/source/inc/adabas/BIndexColumn.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndexColumn.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx
index 4e07f39878..7fa64394c0 100644
--- a/connectivity/source/inc/adabas/BIndexColumns.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndexColumns.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx
index 41ada50221..6bd6af6bd5 100644
--- a/connectivity/source/inc/adabas/BIndexes.hxx
+++ b/connectivity/source/inc/adabas/BIndexes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BIndexes.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx
index 738fc1602a..6ed97dd2e5 100644
--- a/connectivity/source/inc/adabas/BKeys.hxx
+++ b/connectivity/source/inc/adabas/BKeys.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BKeys.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index a9a863eeda..7342707b18 100644
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BPreparedStatement.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx
index a7f977b1d7..cd47032bd2 100644
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BResultSet.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
index 7973774627..4c7d45ecc2 100644
--- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BResultSetMetaData.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 765aefdbff..748513648b 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BStatement.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx
index 8357d96bfd..971dcdd7fa 100644
--- a/connectivity/source/inc/adabas/BTable.hxx
+++ b/connectivity/source/inc/adabas/BTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BTable.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx
index 05dc236ae8..9d7416922b 100644
--- a/connectivity/source/inc/adabas/BTables.hxx
+++ b/connectivity/source/inc/adabas/BTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BTables.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx
index ee768786af..7470fd7576 100644
--- a/connectivity/source/inc/adabas/BUser.hxx
+++ b/connectivity/source/inc/adabas/BUser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BUser.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx
index df7f4a45df..aa64e6fa8d 100644
--- a/connectivity/source/inc/adabas/BUsers.hxx
+++ b/connectivity/source/inc/adabas/BUsers.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BUsers.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx
index 91630c76d0..a8d79400f1 100644
--- a/connectivity/source/inc/adabas/BViews.hxx
+++ b/connectivity/source/inc/adabas/BViews.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BViews.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 7a9c9db5fc..01745bca99 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ACallableStatement.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index 7422683b11..9cd9149e4a 100644
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ACatalog.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx
index 98c2a7f83c..d7f87255bd 100644
--- a/connectivity/source/inc/ado/ACollection.hxx
+++ b/connectivity/source/inc/ado/ACollection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ACollection.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index a5bdbdc422..671a2b133a 100644
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AColumn.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index e069b5325c..e7294c3943 100644
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AColumns.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 4a5ee92dba..86905ad0a7 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AConnection.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 917c65e971..2b03337752 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 4c99835f62..f2e99250d7 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaDataResultSet.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 089ac711cb..4b01fc520e 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADatabaseMetaDataResultSetMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 3305d65beb..58d4cc27a6 100644
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ADriver.hxx,v $
- * $Revision: 1.4.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index 1de05e18f9..70e0ac7bb5 100644
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AGroup.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index 65c572b074..78568fee42 100644
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AGroups.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index f33cc499f0..d34a08d474 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AIndex.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx
index 0bd6ec2b92..6922035a4e 100644
--- a/connectivity/source/inc/ado/AIndexColumn.hxx
+++ b/connectivity/source/inc/ado/AIndexColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AIndexColumn.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx
index a2059031db..4d8f930079 100644
--- a/connectivity/source/inc/ado/AIndexColumns.hxx
+++ b/connectivity/source/inc/ado/AIndexColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AIndexColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index cb36275e26..d849801f04 100644
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AIndexes.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index d1611f30d5..419db6b560 100644
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKey.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx
index 2a050e0560..5bcc800846 100644
--- a/connectivity/source/inc/ado/AKeyColumn.hxx
+++ b/connectivity/source/inc/ado/AKeyColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKeyColumn.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx
index 5e10725d63..e6d7bbae4c 100644
--- a/connectivity/source/inc/ado/AKeyColumns.hxx
+++ b/connectivity/source/inc/ado/AKeyColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKeyColumns.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index 87c91a46a1..35720df5b6 100644
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AKeys.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 8f0750b863..744b7486cf 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: APreparedStatement.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index bf28aecc70..fcc174385c 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AResultSet.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 39872c598e..5f49b78ed5 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AResultSetMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 251ad6e754..63a6f40508 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AStatement.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index 77501ee1b8..95acf62001 100644
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ATable.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 68f36c7d3a..bd77b8ff9b 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ATables.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 6d55de9b9f..ef51e3740c 100644
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AUser.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index d9b26973f6..117a795c1f 100644
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AUsers.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index 6df64d1196..541c4820a1 100644
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AView.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 15d7c368fb..bfbb0d245c 100644
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AViews.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index ddacefec17..08a9ffb70b 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Aolevariant.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 5453fc508a..a4d4f2c051 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Aolewrap.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 453f1ae4b3..12f5c76a21 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Awrapado.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 4c5de413ab..f1594783ac 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Awrapadox.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 164e93d5c0..3e8e7dd7e9 100644
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WrapCatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index 2bb200f4e7..b8417ae72e 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WrapColumn.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index c1bc619cbb..e51cbbcc57 100644
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WrapIndex.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 0966fb5752..2f4a7e129f 100644
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WrapKey.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 55caac3547..85a8e5d4d7 100644
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WrapTable.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx
index 1628f0c78a..203f9cd761 100644
--- a/connectivity/source/inc/ado/WrapTypeDefs.hxx
+++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WrapTypeDefs.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index e198ba54b0..04ecc0b392 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: adoimp.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index 9be1cabaa4..8144e30124 100644
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CCatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx
index 94b62870ae..f87355867a 100644
--- a/connectivity/source/inc/calc/CColumns.hxx
+++ b/connectivity/source/inc/calc/CColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CColumns.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index a6e2d71ed9..ee6cd71803 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CConnection.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index b140b94599..ed078e0653 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CDatabaseMetaData.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index de32e4b257..6e98d9b3f0 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CDriver.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx
index 8523c0f6d0..ddbf9816c3 100644
--- a/connectivity/source/inc/calc/CPreparedStatement.hxx
+++ b/connectivity/source/inc/calc/CPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CPreparedStatement.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx
index dc4f19194a..81a332c5fd 100644
--- a/connectivity/source/inc/calc/CResultSet.hxx
+++ b/connectivity/source/inc/calc/CResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CResultSet.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx
index 5ed5c39e33..1a44a2029e 100644
--- a/connectivity/source/inc/calc/CStatement.hxx
+++ b/connectivity/source/inc/calc/CStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 373afc0926..bda2b35069 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CTable.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 0c7618033e..08bcb98df4 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CTables.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index d93e84007b..50a0ae607b 100644
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DCatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index 499157db8b..e00ed85b78 100644
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DCode.hxx,v $
- * $Revision: 1.3.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index e98c96a567..b11e24d336 100644
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DColumns.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 7c100a0655..adabdfc377 100644
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DConnection.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index e7a9d25baa..7c4493c677 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DDatabaseMetaData.hxx,v $
- * $Revision: 1.10.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index f2f6f682b7..47fbedeb2c 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DDatabaseMetaDataResultSet.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
index 270c7ba2fe..8b40ac3292 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DDatabaseMetaDataResultSetMetaData.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index e1c44c82fe..78ace9e4a3 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DDriver.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index af245cc3fb..2c70bbb823 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndex.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 193a214a16..202a5d21c8 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexColumns.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 3faf2a730b..2d8bfe7db0 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexIter.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 9bbbee0e0d..083cdb7d51 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexPage.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index e5929518b2..218fe8a9ee 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DIndexes.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 98d2b893ac..ca682e3383 100644
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DPreparedStatement.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index f2a3dd6424..fbfbdb61e6 100644
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DResultSet.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index 9f2a46198f..fae73931be 100644
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 9f76e2d03e..d494ceba88 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DTable.hxx,v $
- * $Revision: 1.41.30.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 092ee1b744..1ada68b8cf 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DTables.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index deb67e1d0e..d1eca8094c 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dindexnode.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h
index 51e69a41a6..1bdb4f4512 100644
--- a/connectivity/source/inc/diagnose_ex.h
+++ b/connectivity/source/inc/diagnose_ex.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: diagnose_ex.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index e8146596a8..cff8519643 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FCatalog.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 4562a9b839..26de8fd3ca 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FColumns.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 774979e898..899d8416fd 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FConnection.hxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index c0dd0fe8cd..7042a690a2 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDatabaseMetaData.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index a02cfac29c..d86496037a 100644
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDateFunctions.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index eb563a40e9..21d87f860e 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FDriver.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index 6ba79cc279..cd52f1a115 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FNumericFunctions.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index dbb66b1127..15ab3268b6 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPreparedStatement.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index bfabd3d730..715f631a04 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FResultSet.hxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 966fbb3614..070e75b192 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FResultSetMetaData.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index a398225bd8..82035a24fa 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FStatement.hxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index b1831bb608..d90f53b38c 100644
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FStringFunctions.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 5fa3af288e..ebc9f35780 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FTable.hxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index 150d36a732..4cabaa3161 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FTables.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 747c78f08a..2e93718044 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fanalyzer.hxx,v $
- * $Revision: 1.13.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index de07555d40..1fff3f8015 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fcode.hxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 5ac2f92902..33777352b5 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fcomp.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx
index 42f7da2958..11f98fa806 100644
--- a/connectivity/source/inc/file/filedllapi.hxx
+++ b/connectivity/source/inc/file/filedllapi.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: $
-*
-* $Revision: $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FILEDLLAPI_HXX
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 1ad9c3ec26..43208a80d6 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: quotedstring.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx
index 27c1f69bd8..4692f58171 100644
--- a/connectivity/source/inc/flat/ECatalog.hxx
+++ b/connectivity/source/inc/flat/ECatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ECatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx
index a21c47078a..7c6e7dfd0f 100644
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EColumns.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 92330eb259..ed37e393f9 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EConnection.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index 2a4eca1715..48fc45263d 100644
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EDatabaseMetaData.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 9c87e9c624..e8d079adc0 100644
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EDriver.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index f3b9830328..50ffb9173b 100644
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EPreparedStatement.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index a8e2391e21..1d7e181af7 100644
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EResultSet.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index bb03158414..c80dfe0405 100644
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 24c0b150a0..b17ed72d1e 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ETable.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index ecd864a481..b14379d4c6 100644
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ETables.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 22bca59017..36406b113a 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HCatalog.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index f2d6b56ad7..5f525922c0 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index c97a0dac6b..8d35c8e808 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HConnection.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 9448d925b5..d8c35796d9 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HDriver.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 8303d6aeae..13721e0201 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HStorageAccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index b540d95005..857d5df143 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HStorageMap.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index 9bf144b19c..cc8fe44795 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTable.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 96d33975ef..d91f29779d 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTables.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index f11daee8a1..fc64b6a9db 100644
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HTools.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index de8bf04d35..d103e051f6 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HUser.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 89a54a4334..307cbf79ca 100644
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HUsers.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 4e820fe2d3..c7478af2e8 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HView.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index 41cab0a46c..5b819449d6 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HViews.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx
index 4fbf85963e..5de95bc108 100644
--- a/connectivity/source/inc/internalnode.hxx
+++ b/connectivity/source/inc/internalnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: internalnode.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index a84c81cb62..ff3b5b5257 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ContextClassLoader.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index af3b968a57..98511037ee 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GlobalRef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index de6e11e250..888366b0bf 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LocalRef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 368b48fa2f..c3e5c052d7 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: InputStream.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index c8f68c5acc..ce6ebb5c51 100644
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Reader.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 9bc7dc7d61..cbaa0b5e78 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Boolean.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index 77a8015bc8..a53f527e13 100644
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Class.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index 15c2df6089..52261bfa25 100644
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Exception.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 95fa5b9f71..30526689c9 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Object.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 1c8443e736..37f3b45d39 100644
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: String.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 360d1aa7d3..a5823c24b1 100644
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Throwable.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 00f5673e4a..2a0fa7eb38 100644
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BigDecimal.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index a6d1cf695b..0d4705d60d 100644
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Array.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index 87375866b1..fb0ccb751b 100644
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Blob.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index 5be7d02577..1a236fe00d 100644
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CallableStatement.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index bcb040f49e..07bb5b7e99 100644
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Clob.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 55244525da..6f0f9c9c90 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Connection.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 7c3d10df2b..69cc8f392d 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConnectionLog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index 90420ba6f5..a517194f4c 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DatabaseMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 925f657f73..4d148f5d75 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Driver.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 3301672f8a..68df71921b 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DriverPropertyInfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index 1f675ffe1a..6e164a8b17 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JStatement.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 2a1429bb9d..5b38ad85a7 100644
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PreparedStatement.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index e52e4dc971..995885d4a9 100644
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Ref.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index f1b2d7857d..08f2ffbe92 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResultSet.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 84b799628b..06703fa449 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResultSetMetaData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index f867394c45..39d0e30e46 100644
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SQLException.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index 0606befa89..3568a2c22e 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SQLWarning.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index 2af09c2f02..f6d7d30749 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Timestamp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 098126895a..1f459784f8 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tools.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index 201784aa72..6d0c2d11db 100644
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Date.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index ba3af22952..9e6cef0454 100644
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Property.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index 3a91802657..ec7de2f83f 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YCatalog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 882f710a9e..9bc02b3935 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YColumns.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 45d2fb8ab8..c5779b382e 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YDriver.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 15bddc212a..808305b4c5 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YTable.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 981dcccc1f..9243735717 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YTables.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index e9f5fab811..43b6aafd53 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YUser.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index f173c55d4b..73a7815dd6 100644
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YUsers.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 2a7fde449b..8c531c834d 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: YViews.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 31d3dde82b..56dc936de9 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OBoundParam.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 1b0339a742..b33028ddb4 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OConnection.hxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 114c515737..5ec2f6f52b 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODatabaseMetaData.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index d0134d542d..67bca7c0a2 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODatabaseMetaDataResultSet.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx
index 251ddccd1d..6bd4025248 100644
--- a/connectivity/source/inc/odbc/ODefs3.hxx
+++ b/connectivity/source/inc/odbc/ODefs3.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODefs3.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index b395b022b9..b7c7d36993 100644
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ODriver.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 89bf5ba34e..44c98c3585 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OFunctiondefs.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index 9a6d07c505..0c03b8cb52 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OFunctions.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index dfd2a62830..d6e3fca2e1 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OPreparedStatement.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 194bb50987..3284c3d1d3 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OResultSet.hxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 7b936a3de1..1f15f6bfe5 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OResultSetMetaData.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 4e3547e79b..098b2459f9 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OStatement.hxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 1f81538d6d..5b0a3da64c 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OTools.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
index 5d716c2ca0..a1474098df 100644
--- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx
+++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: $
-*
-* $Revision: $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 8bdaf5b3b6..c1fc8e6c7f 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyids.hxx,v $
- * $Revision: 1.20.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc
index d8956e6f46..a5911dcd0e 100644
--- a/connectivity/source/inc/resource/adabas_res.hrc
+++ b/connectivity/source/inc/resource/adabas_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: adabas_res.hrc,v $
- * $Revision: 1.1.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
index d24afa3829..717e194ca3 100644
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ b/connectivity/source/inc/resource/ado_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ado_res.hrc,v $
- * $Revision: 1.1.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index 9487dd585c..e719018141 100644
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: calc_res.hrc,v $
- * $Revision: 1.3.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index bccdc70ce1..ac7cb89a63 100644
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: common_res.hrc,v $
- * $Revision: 1.3.56.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 83f5b7ed8c..981f5a89b4 100644
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: conn_shared_res.hrc,v $
- * $Revision: 1.5.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index c191451ffc..d4b31e614c 100644
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbase_res.hrc,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
index 2950cbc0d5..ebe7170beb 100644
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ b/connectivity/source/inc/resource/evoab2_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: evoab2_res.hrc,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
index 1cc1c857eb..bbc451920e 100644
--- a/connectivity/source/inc/resource/file_res.hrc
+++ b/connectivity/source/inc/resource/file_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: file_res.hrc,v $
- * $Revision: 1.1.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index e649cd9786..640ed8f5ce 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hsqldb_res.hrc,v $
- * $Revision: 1.1.2.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
index 0919378e34..ff2c483f09 100644
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ b/connectivity/source/inc/resource/jdbc_log.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jdbc_log.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
index e041b08c2f..b03eecdb2b 100644
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ b/connectivity/source/inc/resource/kab_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kab_res.hrc,v $
- * $Revision: 1.1.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
index e53ff50826..74d64aa28a 100644
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ b/connectivity/source/inc/resource/macab_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macab_res.hrc,v $
- * $Revision: 1.1.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index 1cc6a66a93..01e93ae17f 100644
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozab_res.hrc,v $
- * $Revision: 1.3.56.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index e315808c59..b573249b7b 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sharedresources.hxx,v $
- * $Revision: 1.3.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index a2afa33fe8..ea9819fd18 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlscan.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index 7cb514cd36..c89dd4b5eb 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 64526b8a23..78d0435b9a 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mdrivermanager.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index ba5dbb795b..268e0ae1ad 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mdrivermanager.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index d6a3562564..4d9ff4d517 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mregistration.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 34b3f3a582..37691d593c 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PColumn.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 8ef9498008..39b4a4af3b 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: internalnode.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk
index bd84092f9c..95ff750fa0 100644
--- a/connectivity/source/parse/makefile.mk
+++ b/connectivity/source/parse/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.22 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 97875dfd4d..979a6694f2 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -3,14 +3,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: sqlbison.y,v $
-//
-// $Revision: 1.66.6.5 $
-//
 // This file is part of OpenOffice.org.
 //
 // OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index e365fdec1e..77544ece30 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -4,14 +4,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: sqlflex.l,v $
-//
-// $Revision: 1.35 $
-//
 // This file is part of OpenOffice.org.
 //
 // OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index c92fc9b709..dc6d7b688a 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqliterator.cxx,v $
- * $Revision: 1.60 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index a359c64df1..46d1135626 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlnode.cxx,v $
- * $Revision: 1.57 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/parse/wrap_sqlbison.cxx b/connectivity/source/parse/wrap_sqlbison.cxx
index 554beadad3..17993a194b 100644
--- a/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/connectivity/source/parse/wrap_sqlbison.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrap_sqlbison.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/parse/wrap_sqlflex.cxx b/connectivity/source/parse/wrap_sqlflex.cxx
index e713abad02..2cb5ad64ee 100644
--- a/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/connectivity/source/parse/wrap_sqlflex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrap_sqlflex.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
index b4c7380c1a..7a5267f330 100644
--- a/connectivity/source/resource/conn_error_message.src
+++ b/connectivity/source/resource/conn_error_message.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: conn_error_message.src,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
index bdc896f6ac..ea5bb9d000 100644
--- a/connectivity/source/resource/conn_log_res.src
+++ b/connectivity/source/resource/conn_log_res.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: conn_log_res.src,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index bfa1b29c6d..87f69a4aab 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: conn_shared_res.src,v $
- * $Revision: 1.9.30.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk
index 1b01093aec..92a2241adb 100644
--- a/connectivity/source/resource/makefile.mk
+++ b/connectivity/source/resource/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 7d2a5a0002..186b1c0d05 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sharedresources.cxx,v $
- * $Revision: 1.4.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 5e33c7e4c7..f64b17feda 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VCatalog.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index bf10269535..cab11fe4fe 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VCollection.cxx,v $
- * $Revision: 1.43.56.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 3af4714e4b..6c85e3b19a 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VColumn.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index b1a47fe380..bbca151fdf 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VDescriptor.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index b79f30aaa3..aeefd517ca 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VGroup.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index d0d130dcf8..3d411f8c18 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VIndex.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 7e4880f000..6f2622e5c3 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VIndexColumn.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 553dc9f21f..e01be00420 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VKey.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 1b01ed0730..15c2b0c37d 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VKeyColumn.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index f610be3e65..337f7604eb 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VTable.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index beabb301fe..86b395b1ca 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VUser.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 8f221b1c70..6c0ba7ea5d 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VView.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index 0d791ee235..1f70ab435c 100644
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 9dd04fefa9..eb13ea382d 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charset_s.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index babf5ada45..01fa61c00b 100644
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charset_s.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index 0880804027..06a2a9745e 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtfactory.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index cfadea23d4..a1fd16fd78 100644
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk
index 9354a1c7e4..3ddd40871b 100644
--- a/connectivity/source/simpledbt/makefile.mk
+++ b/connectivity/source/simpledbt/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 4f0a8571a9..b2b8dd526a 100644
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parsenode_s.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 35b0a6bcd5..004c3334cb 100644
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parsenode_s.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index af158dd79f..9d85102d33 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parser_s.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index 5389bd9155..248d21e959 100644
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parser_s.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 9ea9f7337e..7d06a2edac 100644
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: refbase.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 9d11875b38..e1ba225156 100644
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: refbase.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 464971bfcb..f5c69edbc8 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: staticdbtools_s.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index cb1928a5c3..6e1fc49447 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: staticdbtools_s.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/target.pmk b/connectivity/target.pmk
index 97ef318b5f..7835f56d75 100755..100644
--- a/connectivity/target.pmk
+++ b/connectivity/target.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 2f252cb907..bc64da71fe 100755..100644
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.22 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/version.mk b/connectivity/version.mk
index 07b8806295..e2a0810323 100644
--- a/connectivity/version.mk
+++ b/connectivity/version.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.18 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/workben/TT/StartTest.java b/connectivity/workben/TT/StartTest.java
index 7ffecc539b..0a76d85f1a 100644
--- a/connectivity/workben/TT/StartTest.java
+++ b/connectivity/workben/TT/StartTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StartTest.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index a65788eba9..60818691ca 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
index 4e4adc2556..51a327ff00 100644
--- a/connectivity/workben/iniParser/makefile.mk
+++ b/connectivity/workben/iniParser/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index a821721f86..b8f887a441 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk
index e0122e42a2..222191d89e 100644
--- a/connectivity/workben/little/makefile.mk
+++ b/connectivity/workben/little/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index f432a76d36..869a30d85d 100644
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SResultSet.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx
index f42dd89c66..67d1c07cc1 100644
--- a/connectivity/workben/testmoz/initUNO.cxx
+++ b/connectivity/workben/testmoz/initUNO.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: initUNO.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index b96eeb1713..62fba7e9b0 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
index 70fa9b80fe..9f890bd2aa 100644
--- a/connectivity/workben/testmoz/makefile.mk
+++ b/connectivity/workben/testmoz/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index bab014cb97..548e9dbc1a 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mozthread.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 8315658d45..7a698641e5 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.hxx,v $
- * $Revision: 1.37.14.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index bd5a3d8892..cd9ba84921 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/inc/makefile.mk b/desktop/inc/makefile.mk
index 5e64fbff98..684030c721 100644
--- a/desktop/inc/makefile.mk
+++ b/desktop/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/inc/pch/precompiled_desktop.cxx b/desktop/inc/pch/precompiled_desktop.cxx
index 1971148d41..f95c830020 100644
--- a/desktop/inc/pch/precompiled_desktop.cxx
+++ b/desktop/inc/pch/precompiled_desktop.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_desktop.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/inc/pch/precompiled_desktop.hxx b/desktop/inc/pch/precompiled_desktop.hxx
index 017531b5cf..796ed48aa7 100644
--- a/desktop/inc/pch/precompiled_desktop.hxx
+++ b/desktop/inc/pch/precompiled_desktop.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: precompiled_desktop.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx
index 7586b18f33..033bb20cfd 100644
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/os2/source/applauncher/makefile.mk b/desktop/os2/source/applauncher/makefile.mk
index 3ffff92250..dd82e9ec02 100644
--- a/desktop/os2/source/applauncher/makefile.mk
+++ b/desktop/os2/source/applauncher/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 39e80ddb1c..605d2b54f6 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 9e0ad134de..7eb3b8650d 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_dp_version.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map
index 7a9493e61e..7321bbca16 100644
--- a/desktop/qa/deployment_misc/version.map
+++ b/desktop/qa/deployment_misc/version.map
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.map,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/registry/data/org/openoffice/Office/Jobs.xcu b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
index b613e86eb2..0572d96a2a 100644
--- a/desktop/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
@@ -2,14 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Jobs.xcu,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/registry/data/org/openoffice/Office/makefile.mk b/desktop/registry/data/org/openoffice/Office/makefile.mk
index 651c731fa4..adcdb9438e 100644
--- a/desktop/registry/data/org/openoffice/Office/makefile.mk
+++ b/desktop/registry/data/org/openoffice/Office/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk
index 52750ca0b4..427b7e5819 100644
--- a/desktop/scripts/makefile.mk
+++ b/desktop/scripts/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 63df07fb69..b0de1d6b63 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -2,14 +2,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: soffice.sh,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.34 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index f49f139e6f..081e414365 100644
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -3,14 +3,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: unoinfo.sh,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index f144994876..4d5dd871c6 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -2,14 +2,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unopkg.sh,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 26866269b7..ca73407213 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1,12 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 1c8a1ed877..c48805fcfe 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.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: appfirststart.cxx,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/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index a477eb2ad4..f35313276f 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appinit.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/appinit.hxx b/desktop/source/app/appinit.hxx
index 3886f0100e..c5b48fd4a4 100644
--- a/desktop/source/app/appinit.hxx
+++ b/desktop/source/app/appinit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appinit.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index 65130cb675..20162a3c8e 100644
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appsys.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx
index 8e64263bae..5d1b06c1bb 100644
--- a/desktop/source/app/appsys.hxx
+++ b/desktop/source/app/appsys.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appsys.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index f61f577694..070f8ae4e2 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
index acdd15a0c8..fd585dc722 100644
--- a/desktop/source/app/checkinstall.cxx
+++ b/desktop/source/app/checkinstall.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: checkinstall.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx
index b1be908bcc..495ea3161b 100644
--- a/desktop/source/app/checkinstall.hxx
+++ b/desktop/source/app/checkinstall.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: checkinstall.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 57e1a85a8c..aa7e53aa59 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdlineargs.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index e2c3e112ab..14b9f3fd3b 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.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: cmdlineargs.hxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index c5069d1a8c..cbc67eb0ee 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdlinehelp.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index e8f48b89a8..62f02115a5 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configinit.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 76d6710ba0..aa327e2cc6 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktop.hrc,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 4b382be9b5..78593ffaf8 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktop.src,v $
- * $Revision: 1.74 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 76abc028a8..e516b5eadd 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktopcontext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index 9cf29dc385..88948e753a 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktopcontext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
index d709fe6b5b..90cc8e220f 100644
--- a/desktop/source/app/desktopresid.cxx
+++ b/desktop/source/app/desktopresid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktopresid.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx
index ddd9a0f0d0..410ca429f5 100644
--- a/desktop/source/app/desktopresid.hxx
+++ b/desktop/source/app/desktopresid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktopresid.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index c3886299d3..f4c7cf7560 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchwatcher.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index ef62dc2614..afe60aed08 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchwatcher.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 42e0f925ea..f7e1f0481e 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: langselect.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 3220557aa8..c63f48dcb7 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: langselect.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index e27613d2f4..21b3f35dfe 100644
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.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: lockfile.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx
index 290f02d6fd..4194341f77 100644
--- a/desktop/source/app/lockfile.hxx
+++ b/desktop/source/app/lockfile.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lockfile.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index f03271f957..c3143b9998 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lockfile2.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index a855f9e066..dceaf1a3fb 100644
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: main.c,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 238685649c..f94f7c045b 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.42.40.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 9e158b7030..bf7c8381df 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: officeipcthread.cxx,v $
- * $Revision: 1.62.44.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index a2949b9742..5402372f20 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: officeipcthread.hxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/omutexmember.hxx b/desktop/source/app/omutexmember.hxx
index 9d2b6708e4..14959b75de 100644
--- a/desktop/source/app/omutexmember.hxx
+++ b/desktop/source/app/omutexmember.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: omutexmember.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 3bc6fdde11..fc06850f23 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sofficemain.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h
index 618d66172d..97775acd70 100644
--- a/desktop/source/app/sofficemain.h
+++ b/desktop/source/app/sofficemain.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sofficemain.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 920da56133..c98a0578ae 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.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: userinstall.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 35aae8cb74..8dd7bed09b 100644
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: userinstall.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/app/version.map b/desktop/source/app/version.map
index 0e1b5cb619..657ee2a954 100644
--- a/desktop/source/app/version.map
+++ b/desktop/source/app/version.map
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.map,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index a3e29bdac3..361807d9fe 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_log.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 04f3f19d2e..0f7c140d7b 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_persmap.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index d981533382..da2b2dcfcf 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_services.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 02d23b240c..7d5a604e28 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_xml.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index e2a05050dc..5df203c60f 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: descedit.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index cfb47e5876..023551ac36 100644
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: descedit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index cf4bcb9343..871401f526 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui.h,v $
- * $Revision: 1.24.86.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 9a3e294c04..bc20a1ec2c 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index af99601334..1cc2e5df27 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_autoscrolledit.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index c73a4df82c..8a8d45a123 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_autoscrolledit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index 9d0fd5d19c..4d554ab4de 100644
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_backend.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 3af4c30364..4c5dfdfc89 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_dependencydialog.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 08c769d528..98cb7de7a0 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_dependencydialog.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index 039921384d..fa74656783 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_dependencydialog.src,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index b46d97e02d..7a836f6290 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_dialog.src,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 21688d51e7..9553bd411b 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_dialog2.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.8.4.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index de8982a7e3..8cdb05d10b 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_dialog2.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.4.74.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index eb4698bf7a..f343dbcb0f 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_dialog2.src,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index f31d63a703..cecf63aa8f 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_extensioncmdqueue.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.7.4.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index 853ce946c2..6b606f0042 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_extensioncmdqueue.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3.14.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 68a06f2a30..f2c120890a 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 6ae6a5f6b8..18f9844349 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -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: dp_gui_dialog2.cxx,v $
- *
- * $Revision: 1.8.4.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 7425c14ae4..8cf8a5df85 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_service.cxx,v $
- * $Revision: 1.23.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 44bf8c19d4..4fa94c5ca1 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_shared.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_system.cxx b/desktop/source/deployment/gui/dp_gui_system.cxx
index 6b04611aa1..740f598499 100644
--- a/desktop/source/deployment/gui/dp_gui_system.cxx
+++ b/desktop/source/deployment/gui/dp_gui_system.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_system.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_system.hxx b/desktop/source/deployment/gui/dp_gui_system.hxx
index 41420e4043..dfdbbdfc08 100644
--- a/desktop/source/deployment/gui/dp_gui_system.hxx
+++ b/desktop/source/deployment/gui/dp_gui_system.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_system.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 82577c614a..1b648a58ad 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_theextmgr.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3.14.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 982fb00c83..1cdd1851d5 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_gui_theextmgr.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx
index 6338ad0144..24055fae72 100644
--- a/desktop/source/deployment/gui/dp_gui_thread.cxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_thread.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx
index ce487efbb4..ffcc2a5ddc 100644
--- a/desktop/source/deployment/gui/dp_gui_thread.hxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_thread.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.cxx b/desktop/source/deployment/gui/dp_gui_updatability.cxx
index d78ade6a8f..2e1f8b9ace 100644
--- a/desktop/source/deployment/gui/dp_gui_updatability.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatability.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_updatability.cxx,v $
- * $Revision: 1.6.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.hxx b/desktop/source/deployment/gui/dp_gui_updatability.hxx
index 7310bcee8f..d255f17612 100644
--- a/desktop/source/deployment/gui/dp_gui_updatability.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatability.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_updatability.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index a764c63c01..b0563dc69a 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_updatedata.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 2620a1f29a..ea6d1dbcdf 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 080148189e..42f84d2324 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 03b5ee9f67..5d84de8489 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index d58f744286..0c5676c026 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_updateinstalldialog.cxx,v $
- * $Revision: 1.9.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 99357e82ed..c4f75fbff8 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_updateinstalldialog.hxx,v $
- * $Revision: 1.4.126.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 77cd36f2cc..1676dfebd6 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_updateinstalldialog.src,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index e53693de65..c104822a28 100644
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_gui_versionboxes.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index d0e2c44be2..4ab3360016 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: license_dialog.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 82e8b00c25..4733922dc6 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: license_dialog.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 4d563ae159..976367f7ca 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.20.30.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index b78e54bb71..51a2397fb3 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: db.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index a516099268..bf48eaae9d 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_dependencies.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index f2cb02c238..29ddd391d8 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_descriptioninfoset.hxx,v $
- * $Revision: 1.9.34.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index f7af05c222..6fc49c3008 100644
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_identifier.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index cd54bf9723..ffd4c1f858 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_interact.h,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 20437d0391..8add1933c8 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_misc.h,v $
- * $Revision: 1.13.86.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk
index 29ba4d4898..b91bc7c88a 100644
--- a/desktop/source/deployment/inc/dp_misc.mk
+++ b/desktop/source/deployment/inc/dp_misc.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: dp_misc.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx
index c32c132bca..ef34ef0687 100644
--- a/desktop/source/deployment/inc/dp_misc_api.hxx
+++ b/desktop/source/deployment/inc/dp_misc_api.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_misc_api.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index fc22a05ca7..35c732bb39 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_persmap.h,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 8db396c82f..26cffc9b87 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_platform.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index edfd8ec0c0..7dcdd7df7f 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_resource.h,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index e20fc689f1..6f91275048 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_ucb.h,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx
index e9d966cea0..9808ebaab3 100644
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_version.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index b410a8d197..fce4140c67 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_xml.h,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index 8ee3efd34f..d5c84a2306 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.18 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 02dccabff5..04dc22b77a 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_activepackages.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 6b9790f042..1c58f76be2 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_activepackages.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 16a502b7b6..b4c0150e5e 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index a933cf01db..1b4996ed3b 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_manager.cxx,v $
- * $Revision: 1.33.8.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 3519e559be..754603c83c 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_manager.h,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index 0a50b96ef1..bdbfc079cd 100644
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_manager.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src
index ab8e5148bd..95ede4aa62 100644
--- a/desktop/source/deployment/manager/dp_manager.src
+++ b/desktop/source/deployment/manager/dp_manager.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_manager.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 2d8010383c..f002cee8b7 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_managerfac.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index 6e4c282b35..e7fd9f7a50 100644
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/migration/dp_migration.cxx b/desktop/source/deployment/migration/dp_migration.cxx
index 5225d0cc4c..4696e90b00 100644
--- a/desktop/source/deployment/migration/dp_migration.cxx
+++ b/desktop/source/deployment/migration/dp_migration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_migration.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/migration/makefile.mk b/desktop/source/deployment/migration/makefile.mk
index 8eaccc68cd..4898487065 100644
--- a/desktop/source/deployment/migration/makefile.mk
+++ b/desktop/source/deployment/migration/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index 3b449246c4..f6c43f5aa7 100644
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: db.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index b509315da6..a21522e782 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 0479c70845..1f6b7655a9 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_descriptioninfoset.cxx,v $
- * $Revision: 1.7.34.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index 6ade60ad8d..9659bc6759 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_identifier.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index a9fe5a5156..5f4e5f4290 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_interact.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index c067b26d1a..5b10737494 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_misc.cxx,v $
- * $Revision: 1.19.8.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_misc.hrc b/desktop/source/deployment/misc/dp_misc.hrc
index 76a340adb3..55fabac5c5 100644
--- a/desktop/source/deployment/misc/dp_misc.hrc
+++ b/desktop/source/deployment/misc/dp_misc.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_misc.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 67a2bf054a..0d341122af 100644
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index a61fd6c4af..3ec15ae4a5 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dp_platform.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.86.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 54aff70ee1..3b21cc4363 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_resource.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 5d17a87daa..e3e8c7dbfe 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_ucb.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index 440dc8d98d..3e34cd6fa9 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_version.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index b06788de8d..3bea3744f3 100644
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 3f2def05d7..4a7c0ce3c2 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_component.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index 4d7549923b..53085a48d1 100644
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_component.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src
index e41bb82204..36f2a1cc4a 100644
--- a/desktop/source/deployment/registry/component/dp_component.src
+++ b/desktop/source/deployment/registry/component/dp_component.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_component.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/component/makefile.mk b/desktop/source/deployment/registry/component/makefile.mk
index af5e4c6d49..a66e60cd7f 100644
--- a/desktop/source/deployment/registry/component/makefile.mk
+++ b/desktop/source/deployment/registry/component/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index bf63a338ee..c1bed5ecb0 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_configuration.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
index 8e62296be7..01e1905228 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_configuration.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src
index 2ed7c62b51..7ff749b184 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.src
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_configuration.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
index 433b1e638f..fb869bc9d2 100644
--- a/desktop/source/deployment/registry/configuration/makefile.mk
+++ b/desktop/source/deployment/registry/configuration/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index f37a9d5bfe..0fe0d28f94 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_backend.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 4cb3951265..26ac25e657 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_registry.cxx,v $
- * $Revision: 1.12.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src
index 0ba362ea92..e5d3bff704 100644
--- a/desktop/source/deployment/registry/dp_registry.src
+++ b/desktop/source/deployment/registry/dp_registry.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_registry.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 902d9f6645..f1af322ae6 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_executable.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/executable/makefile.mk b/desktop/source/deployment/registry/executable/makefile.mk
index 7ad5289655..2689694d15 100644
--- a/desktop/source/deployment/registry/executable/makefile.mk
+++ b/desktop/source/deployment/registry/executable/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 9b532d68e4..16872b958c 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_help.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc
index 2d0d1883e9..3e3007a9df 100644
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/desktop/source/deployment/registry/help/dp_help.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_help.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src
index 4d1ccfaf36..6b6a3f9a65 100644
--- a/desktop/source/deployment/registry/help/dp_help.src
+++ b/desktop/source/deployment/registry/help/dp_help.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_help.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
index 9e11f82d3a..1a8d5427c6 100644
--- a/desktop/source/deployment/registry/help/makefile.mk
+++ b/desktop/source/deployment/registry/help/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 5ce311d1dc..130cfb9e32 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_backend.h,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
index 7dc6dfad2f..4a3b1d0b1a 100644
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ b/desktop/source/deployment/registry/inc/dp_registry.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_registry.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/makefile.mk b/desktop/source/deployment/registry/makefile.mk
index 7741583d93..3ca41615dd 100644
--- a/desktop/source/deployment/registry/makefile.mk
+++ b/desktop/source/deployment/registry/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/package/dp_description.cxx b/desktop/source/deployment/registry/package/dp_description.cxx
index 48a8633f98..92434f38d8 100644
--- a/desktop/source/deployment/registry/package/dp_description.cxx
+++ b/desktop/source/deployment/registry/package/dp_description.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_description.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/package/dp_description.hxx b/desktop/source/deployment/registry/package/dp_description.hxx
index aaaa500721..44f2d20cae 100644
--- a/desktop/source/deployment/registry/package/dp_description.hxx
+++ b/desktop/source/deployment/registry/package/dp_description.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_description.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index af792565be..8dd4ff63d9 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_package.cxx,v $
- * $Revision: 1.34.16.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
index 9c2fb9bc0c..3a840b64f0 100644
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ b/desktop/source/deployment/registry/package/dp_package.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_package.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src
index 73f5a9d3be..57307040bb 100644
--- a/desktop/source/deployment/registry/package/dp_package.src
+++ b/desktop/source/deployment/registry/package/dp_package.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_package.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/package/makefile.mk b/desktop/source/deployment/registry/package/makefile.mk
index 007574eeff..7d222408d9 100644
--- a/desktop/source/deployment/registry/package/makefile.mk
+++ b/desktop/source/deployment/registry/package/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 0c0b3c5191..f855285692 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_lib_container.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index a3033a1162..3e7cbf54cb 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_lib_container.h,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 1a8a0e4d1b..d22699c6f8 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_script.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index 908e7b652d..8ddfa6f51f 100644
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_script.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src
index d2c2d9f84e..117f4eac94 100644
--- a/desktop/source/deployment/registry/script/dp_script.src
+++ b/desktop/source/deployment/registry/script/dp_script.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_script.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/script/makefile.mk b/desktop/source/deployment/registry/script/makefile.mk
index 76195895b2..37d785700f 100644
--- a/desktop/source/deployment/registry/script/makefile.mk
+++ b/desktop/source/deployment/registry/script/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 0653934af9..a18ad93cdb 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_parceldesc.cxx,v $
- * $Revision: 1.7.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 60f0fab348..6fc7509b9d 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_parceldesc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index c460409890..05de294ebd 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_sfwk.cxx,v $
- * $Revision: 1.16.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
index 3ddae3366d..0eb619e839 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_sfwk.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
index 028d30a2d1..c8d37ce067 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dp_sfwk.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/deployment/registry/sfwk/makefile.mk b/desktop/source/deployment/registry/sfwk/makefile.mk
index 2884e79861..d406c44155 100644
--- a/desktop/source/deployment/registry/sfwk/makefile.mk
+++ b/desktop/source/deployment/registry/sfwk/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/target.pmk b/desktop/source/deployment/target.pmk
index 067db401b1..06602c9bfb 100644
--- a/desktop/source/deployment/target.pmk
+++ b/desktop/source/deployment/target.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: target.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk
index c34f7e1825..03f5e644ab 100644
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/source/deployment/unopkg/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
index efa9e1de5f..79c5786286 100644
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/inc/exithelper.hxx b/desktop/source/inc/exithelper.hxx
index 76247c7815..65e9b956de 100644
--- a/desktop/source/inc/exithelper.hxx
+++ b/desktop/source/inc/exithelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: exithelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 6532e1687e..9c9a2d44d1 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpid.hrc,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx
index efbdcd6c8a..91b0c89dc8 100644
--- a/desktop/source/migration/cfgfilter.cxx
+++ b/desktop/source/migration/cfgfilter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgfilter.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
index d5aaf884ac..9b6f6a66e4 100644
--- a/desktop/source/migration/makefile.mk
+++ b/desktop/source/migration/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 0f78223964..1aba301f90 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.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: migration.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -16,7 +13,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT uno::Any WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
diff --git a/desktop/source/migration/migration.hrc b/desktop/source/migration/migration.hrc
deleted file mode 100644
index 9c558e357c..0000000000
--- a/desktop/source/migration/migration.hrc
+++ /dev/null
@@ -1 +0,0 @@
-.
diff --git a/desktop/source/migration/migration.hxx b/desktop/source/migration/migration.hxx
index 545c47eecd..5ac8c5f570 100644
--- a/desktop/source/migration/migration.hxx
+++ b/desktop/source/migration/migration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: migration.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/migration.src b/desktop/source/migration/migration.src
deleted file mode 100644
index e69de29bb2..0000000000
--- a/desktop/source/migration/migration.src
+++ /dev/null
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index aea93b596e..b1971c9984 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: migration_impl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index a8bba2ee0a..06f8f99fa0 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pages.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 0f3e660f89..65056134e6 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pages.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index b480a241d0..64cc6744e4 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autocorrmigration.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx
index 669ff5830c..65e1ebcf69 100644
--- a/desktop/source/migration/services/autocorrmigration.hxx
+++ b/desktop/source/migration/services/autocorrmigration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autocorrmigration.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 94e6ebc12f..0250d1a065 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicmigration.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index f9af1ea829..323ebce632 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basicmigration.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index 7be21587fa..c1971e9d4d 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cexports.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/cppumaker.mk b/desktop/source/migration/services/cppumaker.mk
index c1d1fedcfb..854146c35f 100644
--- a/desktop/source/migration/services/cppumaker.mk
+++ b/desktop/source/migration/services/cppumaker.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: cppumaker.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/migration/services/extensionmigration.cxx b/desktop/source/migration/services/extensionmigration.cxx
index adf2038d8e..3553c33d63 100755..100644
--- a/desktop/source/migration/services/extensionmigration.cxx
+++ b/desktop/source/migration/services/extensionmigration.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: extensionmigration.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/services/extensionmigration.hxx b/desktop/source/migration/services/extensionmigration.hxx
index 58588ceb7d..35425fc64c 100755..100644
--- a/desktop/source/migration/services/extensionmigration.hxx
+++ b/desktop/source/migration/services/extensionmigration.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: extensionmigration.hxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 065d158138..5acba6be6e 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jvmfwk.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 5786524ee6..2159f5514f 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jvmfwk.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 55397a7cb1..632a6122c8 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index c2f670680e..ff89fcf299 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: misc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index c5a5996473..02a0ab8de3 100755..100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wordbookmigration.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index e75d6a080d..83c66ee012 100755..100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wordbookmigration.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 658224027e..2bc9c1cd7a 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wizard.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
index 9022b79c4b..57789b00fa 100644
--- a/desktop/source/migration/wizard.hrc
+++ b/desktop/source/migration/wizard.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wizard.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index edbae53318..8b18e4e788 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wizard.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index 1130bd6f05..b571785866 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -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: wizard.src,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 8d6e973133..b4358dbee9 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceptor.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index c54d63c7cc..b6c4ca1a7a 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceptor.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk
index e269ec44d9..68732a6c46 100644
--- a/desktop/source/offacc/makefile.mk
+++ b/desktop/source/offacc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/pagein/file_image.h b/desktop/source/pagein/file_image.h
index a575465ddb..42054291b5 100644
--- a/desktop/source/pagein/file_image.h
+++ b/desktop/source/pagein/file_image.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: file_image.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pagein/file_image_unx.c b/desktop/source/pagein/file_image_unx.c
index f82ff1d179..3c9bbd38a8 100644
--- a/desktop/source/pagein/file_image_unx.c
+++ b/desktop/source/pagein/file_image_unx.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: file_image_unx.c,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 85cbb4d3c9..416d59674a 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c
index 7f00c86e8e..97a0feef83 100644
--- a/desktop/source/pagein/pagein.c
+++ b/desktop/source/pagein/pagein.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pagein.c,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 4a1f409f45..b154a6699c 100644
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index fc56984781..6ad02fc21e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg_app.cxx,v $
- * $Revision: 1.14.58.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 4c542445c4..a784089d87 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg_cmdenv.cxx,v $
- * $Revision: 1.12.8.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c
index 3cc02c0ba3..6a6cb84697 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_main.c
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg_main.c,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h
index 5b6e9c4207..08f02612a8 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_main.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg_main.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 3518b3fb1e..685368e766 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg_misc.cxx,v $
- * $Revision: 1.15.52.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 31cbd48398..80174245a2 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkg_shared.h,v $
- * $Revision: 1.9.8.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/pkgchk/unopkg/version.map b/desktop/source/pkgchk/unopkg/version.map
index 5e0b22c95d..66b81247e8 100644
--- a/desktop/source/pkgchk/unopkg/version.map
+++ b/desktop/source/pkgchk/unopkg/version.map
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.map,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java
index 3d396e3b8d..a30f12e623 100644
--- a/desktop/source/registration/com/sun/star/registration/Registration.java
+++ b/desktop/source/registration/com/sun/star/registration/Registration.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Registration.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/registration/com/sun/star/registration/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk
index f20eaf71ad..68bcfce3fc 100644
--- a/desktop/source/registration/com/sun/star/registration/makefile.mk
+++ b/desktop/source/registration/com/sun/star/registration/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
index b0e944a0f8..0f436cbd41 100644
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
index f3b0b9c3c3..07768a3cb3 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index a58072d363..9bcee251bc 100644
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
index c58d83a33d..9323e5de7e 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
@@ -1,531 +1,531 @@
-

-/*

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

- *

- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

- *

- * The contents of this file are subject to the terms of either the GNU

- * General Public License Version 2 only ("GPL") or the Common Development

- * and Distribution License("CDDL") (collectively, the "License").  You

- * may not use this file except in compliance with the License. You can obtain

- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html

- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific

- * language governing permissions and limitations under the License.

- *

- * When distributing the software, include this License Header Notice in each

- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.

- * Sun designates this particular file as subject to the "Classpath" exception

- * as provided by Sun in the GPL Version 2 section of the License file that

- * accompanied this code.  If applicable, add the following below the License

- * Header, with the fields enclosed by brackets [] replaced by your own

- * identifying information: "Portions Copyrighted [year]

- * [name of copyright owner]"

- *

- * Contributor(s):

- *

- * If you wish your version of this file to be governed by only the CDDL or

- * only the GPL Version 2, indicate your decision by adding "[Contributor]

- * elects to include this software in this distribution under the [CDDL or GPL

- * Version 2] license."  If you don't indicate a single choice of license, a

- * recipient has the option to distribute your version of this file under

- * either the CDDL, the GPL Version 2 or to extend the choice of license to

- * its licensees as provided above.  However, if you add GPL Version 2 code

- * and therefore, elected the GPL Version 2 license, then the option applies

- * only if the new code is made subject to such option by the copyright

- * holder.

- */

-

-package com.sun.star.servicetag;

-

-import java.io.*;

-import java.net.UnknownHostException;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.LinkedHashMap;

-import java.util.Map;

-import java.util.Set;

-

-import static com.sun.star.servicetag.RegistrationDocument.*;

-

-/**

- * A {@code RegistrationData} object is a container of one or more 

- * {@link #getServiceTags service tags} that identify the 

- * components for product registration.

- * Each {@code RegistrationData} object has a {@link #getRegistrationURN

- * uniform resource name} (URN) as its identifier.

- * <a name="EnvMap"></a>

- * It also has an <i>environment map</i> with

- * the following elements:

- * <blockquote>

- *       <table border=0>

- *       <tr>

- *          <td><tt>hostname</tt></td>

- *          <td>Hostname of the system</td>

- *          <td>e.g. woody</td>

- *       </tr>

- *       <tr>

- *          <td><tt>hostId</tt></td>

- *          <td>Host ID of the system</td>

- *          <td>e.g. 83abc1ab</td>

- *       </tr>

- *       <tr>

- *          <td><tt>osName</tt></td>

- *          <td>Operating system name</td>

- *          <td> e.g. SunOS</td>

- *       </tr>

- *       <tr>

- *          <td><tt>osVersion</tt></td>

- *          <td>Operating system version</td>

- *          <td> e.g. 5.10</td>

- *       </tr>

- *       <tr>

- *          <td><tt>osArchitecture</tt></td>

- *          <td>Operating system architecture</td>

- *          <td> e.g. sparc</td>

- *       </tr>

- *       <tr>

- *          <td><tt>systemModel</tt></td>

- *          <td>System model</td>

- *          <td> e.g. SUNW,Sun-Fire-V440</td>

- *       </tr>

- *       <tr>

- *          <td><tt>systemManufacturer</tt></td>

- *          <td>System manufacturer</td>

- *          <td> e.g. Sun Microsystems</td>

- *       </tr>

- *       <tr>

- *          <td><tt>cpuManufacturer</tt></td>

- *          <td>CPU manufacturer</td>

- *          <td> e.g. Sun Microsystems</td>

- *       </tr>

- *       <tr>

- *          <td><tt>serialNumber</tt></td>

- *          <td>System serial number</td>

- *          <td> e.g. BEL078932</td>

- *       </tr>

- *       <tr>

- *          <td><tt>physmem</tt></td>

- *          <td>Physical memory for the system (in MB)</td>

- *          <td> e.g. 4096</td>

- *       </tr>

- *       </table>

- *  </blockquote>

- * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.

- * If an element is not available on a system and their value will be

- * empty.

- * <p>

- * <a name="XMLSchema">

- * <b>Registration XML Schema</b></a>

- * <p>

- * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from 

- * and {@link #storeToXML stored} into an XML file in the format described 

- * by the

- * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">

- * registration data schema</a>.  The registration data schema is defined by the 

- * Service Tags Technology.

- * <p>

- * Typically the registration data is constructed at installation time

- * and stored in an XML file for later service tag lookup or registration.

- * 

- * <p>

- * <b>Example Usage</b>

- * <p>

- * The examples below show how the {@code RegistrationData} can be 

- * used for product registration.

- * Exception handling is not shown in these examples for clarity.

- * <ol>

- * <li>This example shows how the JDK creates a JDK service tag, installs it

- * in the system service tag registry and adds it to the registration data.

- * <br>

- * <blockquote><pre>

- *   // create a service tag object with an instance_urn

- *   ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),

- *                                          ....);

- *   // Adds to the system service tag registry if supported

- *   if (Registry.isSupported()) {

- *       Registry.getSystemRegistry().addServiceTag(st);

- *   }

- * 

- *   // add to the registration data

- *   RegistrationData registration  = new RegistrationData();

- *   registration.addServiceTag(st); 

- * </pre></blockquote>

- * </li>

- * <li>At this point, the registration data is ready to 

- * send to Sun Connection for registration. This example shows how to register 

- * the JDK via the <i>Registration Relay Service</i>.

- * <p>

- * There are several registration services for Sun Connection. For example,

- * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">

- * Registration Relay Service</a> is a web application interface that

- * processes the registration data payload sent via HTTP post

- * and hosts the registration user interface for a specified 

- * registration URL.  Refer to the 

- * Registration Relay Service Specification for details.

- * <p>

- * <blockquote><pre>

- *   // Open the connection to the URL of the registration service

- *   HttpsURLConnection con = (HttpsURLConnection) url.openConnection();

- *   con.setDoInput(true);

- *   con.setDoOutput(true);

- *   con.setUseCaches(false);

- *   con.setAllowUserInteraction(false);

- *   con.setRequestMethod("POST");

- *   con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");

- *   con.connect();

- *

- *   // send the registration data to the registration service

- *   OutputStream out = con.getOutputStream();

- *   registration.storeToXML(out);

- *   out.close();

- * </pre></blockquote>

- * </li>

- * <li>This example shows how to store the registration data in an XML file.

- *     for later service tag lookup or registration.

- * <br>

- * <blockquote><pre>

- *   BufferedOutputStream out = new BufferedOutputStream(

- *       new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));

- *   registration.storeToXML(out);

- *   out.close();

- * </pre></blockquote>

- * </li> 

- * <li>This example shows how to install service tags that are in the 

- * registration data in the system service tag registry when determined

- * to be available.  The system service tag registry might not have existed 

- * when the registration data was constructed.

- * <br>

- * <blockquote><pre>

- *   if (Registry.isSupported()) {

- *       Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();

- *       for (ServiceTag st : svctags) {

- *           Registry.getSystemRegistry().addServiceTag(st);

- *       }

- *   }

- * </pre></blockquote>

- * </li>

- * </ol>

- * 

- * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>

- */

-public class RegistrationData {

-    private final Map<String, String> environment;

-    private final Map<String, String> cpuInfo;

-    private final Map<String, ServiceTag> svcTagMap;

-    private final String urn;

-

-    /**

-     * Creates a {@code RegistrationData} object with a generated

-     * {@link #getRegistrationURN registration URN}.

-     * The following keys in the {@link #getEnvironmentMap environment map}

-     * will be initialized for the configuration of the 

-     * running system:

-     * <blockquote>

-     * <tt>hostname</tt>, <tt>osName</tt>,  <tt>osVersion</tt> and

-     * <tt>osArchitecture</tt>

-     * </blockquote>

-     * and the value of other keys may be empty.

-     */

-    public RegistrationData() {

-        this(Util.generateURN());

-    }

-    

-    // package private

-    RegistrationData(String urn) {

-        this.urn = urn;

-        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();

-        this.environment = initEnvironment(sysEnv);

-        this.cpuInfo = initCpuInfo(sysEnv);

-        this.svcTagMap = new LinkedHashMap<String, ServiceTag>();

-    }

-    

-    private Map<String, String> initEnvironment(SystemEnvironment sysEnv) {

-        Map<String, String> map = new LinkedHashMap<String, String>();

-        map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());

-        map.put(ST_NODE_HOST_ID, sysEnv.getHostId());

-        map.put(ST_NODE_OS_NAME, sysEnv.getOsName());

-        map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());

-        map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());

-        map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());

-        map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());

-        map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());

-        map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());

-        map.put(ST_NODE_PHYS_MEM, sysEnv.getPhysMem());

-        return map;

-    }  

-

-    private Map<String, String> initCpuInfo(SystemEnvironment sysEnv) {

-        Map<String, String> map = new LinkedHashMap<String, String>();

-        map.put(ST_NODE_SOCKETS, sysEnv.getSockets());

-        map.put(ST_NODE_CORES, sysEnv.getCores());

-        map.put(ST_NODE_VIRT_CPUS, sysEnv.getVirtCpus());

-        map.put(ST_NODE_CPU_NAME, sysEnv.getCpuName());

-        map.put(ST_NODE_CLOCK_RATE, sysEnv.getClockRate());

-        return map;

-    }  

-    

-    /**

-     * Returns the uniform resource name of this registration data

-     * in this format:

-     * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>

-     * 

-     * @return the URN of this registration data.

-     */

-    public String getRegistrationURN() {

-        return urn;

-    }

-

-    /**

-     * Returns a map containing the environment information for this

-     * registration data.  See the set of <a href="#EnvMap">keys</a>

-     * in the environment map. Subsequent update to the environment

-     * map via the {@link #setEnvironment setEnvironment} method will not be reflected

-     * in the returned map.

-     * 

-     * @return an environment map for this registration data. 

-     */

-    public Map<String, String> getEnvironmentMap() {

-        return new LinkedHashMap<String,String>(environment);

-    }

-

-    /**

-     * Returns a map containing the cpu information for this

-     * registration data.  Subsequent update to the cpu info

-     * map via the {@link #setCpuInfo setCpuInfo} method will not be reflected

-     * in the returned map.

-     *

-     * @return a cpu info map for this registration data.

-     */

-    public Map<String, String> getCpuInfoMap() {

-        return new LinkedHashMap<String,String>(cpuInfo);

-    }

-

-    /**

-     * Sets an element of the specified {@code name} in the environment map 

-     * with the given {@code value}.

-     * 

-     * @throws IllegalArgumentException if {@code name} is not a valid key

-     * in the environment map, or {@code value} is not valid.

-     */

-    public void setEnvironment(String name, String value) {    

-        if (name == null) {

-            throw new NullPointerException("name is null");

-        }

-        if (value == null) {

-            throw new NullPointerException("value is null");

-        }

-        if (environment.containsKey(name)) {

-            if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {

-                if (value.length() == 0) {

-                    throw new IllegalArgumentException("\"" +

-                        name + "\" requires non-empty value.");

-                }

-            }

-            environment.put(name, value);

-        } else {

-            throw new IllegalArgumentException("\"" +

-                 name + "\" is not an environment element.");

-        }   

-    }

-

-    /**

-     * Sets an element of the specified {@code name} in the cpu info map

-     * with the given {@code value}.

-     *

-     * @throws IllegalArgumentException if {@code name} is not a valid key

-     * in the cpu info map, or {@code value} is not valid.

-     */

-    public void setCpuInfo(String name, String value) {    

-        if (name == null) {

-            throw new NullPointerException("name is null");

-        }

-        if (value == null) {

-            throw new NullPointerException("value is null");

-        }

-        if (cpuInfo.containsKey(name)) {

-            cpuInfo.put(name, value);

-        } else {

-            throw new IllegalArgumentException("\"" +

-                 name + "\" is not an cpuinfo element.");

-        }   

-    }

-

-    /**

-     * Returns all service tags in this registration data.

-     * 

-     * @return  a {@link Set Set} of the service tags

-     * in this registration data.

-     */

-    public Set<ServiceTag> getServiceTags() {

-        return new HashSet<ServiceTag>(svcTagMap.values());

-    }

-

-    /**

-     * Adds a service tag to this registration data. 

-     * If the given service tag has an empty <tt>instance_urn</tt>,

-     * this method will generate a URN and place it in the copy 

-     * of the service tag in this registration data. 

-     * This method will return the {@code ServiceTag} object

-     * added to this registration data.

-     * 

-     * @param st {@code ServiceTag} object to be added.

-     * @return a {@code ServiceTag} object added to this registration data.

-     * 

-     * @throws IllegalArgumentException if 

-     *   a service tag of the same {@link ServiceTag#getInstanceURN 

-     *   <tt>instance_urn</tt>} already exists in the registry.

-     */

-    public synchronized ServiceTag addServiceTag(ServiceTag st) {

-        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);

-        

-        String instanceURN = svcTag.getInstanceURN();

-        if (svcTagMap.containsKey(instanceURN)) {

-            throw new IllegalArgumentException("Instance_urn = " + instanceURN +

-                    " already exists in the registration data.");

-        } else {

-            svcTagMap.put(instanceURN, svcTag);

-        }

-        return svcTag;

-    }

-

-    /**

-     * Returns a service tag of the given <tt>instance_urn</tt> in this registration

-     * data.

-     *

-     * @param instanceURN the <tt>instance_urn</tt> of the service tag

-     * @return the {@code ServiceTag} object of the given  <tt>instance_urn</tt>

-     *         if exists; otherwise return {@code null}.

-     */

-    public synchronized ServiceTag getServiceTag(String instanceURN) {

-        if (instanceURN == null) {

-            throw new NullPointerException("instanceURN is null");

-        }

-        return svcTagMap.get(instanceURN);

-    }

-

-    /**

-     * Removes a service tag of the given <tt>instance_urn</tt> from this 

-     * registration data.

-     *

-     * @param instanceURN the <tt>instance_urn</tt> of 

-     * the service tag to be removed.

-     *

-     * @return the removed {@code ServiceTag} object;

-     * or {@code null} if the service tag does not exist in this 

-     * registration data.

-     */

-    public synchronized ServiceTag removeServiceTag(String instanceURN) {

-        if (instanceURN == null) {

-            throw new NullPointerException("instanceURN is null");

-        }

-

-        ServiceTag svcTag = null;

-        if (svcTagMap.containsKey(instanceURN)) {

-            svcTag = svcTagMap.remove(instanceURN);

-        }

-        return svcTag;

-    }

-

-     /**

-     * Updates the <tt>product_defined_instance_id</tt> in the service tag 

-     * of the given <tt>instance_urn</tt> in this registration data.

-     * 

-     * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.

-     * @param productDefinedInstanceID the value of the

-     * <tt>product_defined_instance_id</tt> to be set.

-     * 

-     * @return the updated {@code ServiceTag} object;

-     * or {@code null} if the service tag does not exist in this 

-     * registration data.

-     */

-    public synchronized ServiceTag updateServiceTag(String instanceURN,

-                                                    String productDefinedInstanceID) {

-        ServiceTag svcTag = getServiceTag(instanceURN);

-        if (svcTag == null) {

-            return null;

-        }

-

-        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);

-        // update the product defined instance ID field

-        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);

-        svcTagMap.put(instanceURN, svcTag);

-        return svcTag;

-    }

-    

-    /**

-     * Reads the registration data from the XML document on the 

-     * specified input stream.  The XML document must be 

-     * in the format described by the <a href="#XMLSchema">

-     * registration data schema</a>.

-     * The specified stream is closed after this method returns.

-     * 

-     * @param in the input stream from which to read the XML document.

-     * @return a {@code RegistrationData} object read from the input

-     * stream.

-     * 

-     * @throws IllegalArgumentException if the input stream 

-     * contains an invalid registration data.

-     * 

-     * @throws IOException if an error occurred when reading from the input stream.

-     */

-    public static RegistrationData loadFromXML(InputStream in) throws IOException {

-        try {

-            return RegistrationDocument.load(in);

-        } finally {

-            in.close();

-        }

-    }

-    

-    /**

-     * Writes the registration data to the specified output stream 

-     * in the format described by the <a href="#XMLSchema">

-     * registration data schema</a> with "UTF-8" encoding.

-     * The specified stream remains open after this method returns.

-     * 

-     * @param os the output stream on which to write the XML document.

-     * 

-     * @throws IOException if an error occurred when writing to the output stream.

-     */

-    public void storeToXML(OutputStream os) throws IOException {

-        RegistrationDocument.store(os, this);

-        os.flush();

-    }

-

-    /** 

-     * Returns a newly allocated byte array containing the registration

-     * data in XML format.

-     *

-     * @return a newly allocated byte array containing the registration

-     * data in XML format.

-     */

-    public byte[] toXML() {

-        try {

-            ByteArrayOutputStream out = new ByteArrayOutputStream();

-            storeToXML(out);

-            return out.toByteArray();

-        } catch (IOException e) {

-            // should not reach here

-            return new byte[0];

-        }

-    }

-

-    /**

-     * Returns a string representation of this registration data in XML

-     * format.

-     * 

-     * @return a string representation of this registration data in XML

-     *         format.

-     */

-    @Override

-    public String toString() {

-        try {

-            ByteArrayOutputStream out = new ByteArrayOutputStream();

-            storeToXML(out);

-            return out.toString("UTF-8");

-        } catch (IOException e) {

-            // should not reach here

-            return "Error creating the return string.";

-        }

-    }

-}

+
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code.  If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.star.servicetag;
+
+import java.io.*;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static com.sun.star.servicetag.RegistrationDocument.*;
+
+/**
+ * A {@code RegistrationData} object is a container of one or more 
+ * {@link #getServiceTags service tags} that identify the 
+ * components for product registration.
+ * Each {@code RegistrationData} object has a {@link #getRegistrationURN
+ * uniform resource name} (URN) as its identifier.
+ * <a name="EnvMap"></a>
+ * It also has an <i>environment map</i> with
+ * the following elements:
+ * <blockquote>
+ *       <table border=0>
+ *       <tr>
+ *          <td><tt>hostname</tt></td>
+ *          <td>Hostname of the system</td>
+ *          <td>e.g. woody</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>hostId</tt></td>
+ *          <td>Host ID of the system</td>
+ *          <td>e.g. 83abc1ab</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>osName</tt></td>
+ *          <td>Operating system name</td>
+ *          <td> e.g. SunOS</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>osVersion</tt></td>
+ *          <td>Operating system version</td>
+ *          <td> e.g. 5.10</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>osArchitecture</tt></td>
+ *          <td>Operating system architecture</td>
+ *          <td> e.g. sparc</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>systemModel</tt></td>
+ *          <td>System model</td>
+ *          <td> e.g. SUNW,Sun-Fire-V440</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>systemManufacturer</tt></td>
+ *          <td>System manufacturer</td>
+ *          <td> e.g. Sun Microsystems</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>cpuManufacturer</tt></td>
+ *          <td>CPU manufacturer</td>
+ *          <td> e.g. Sun Microsystems</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>serialNumber</tt></td>
+ *          <td>System serial number</td>
+ *          <td> e.g. BEL078932</td>
+ *       </tr>
+ *       <tr>
+ *          <td><tt>physmem</tt></td>
+ *          <td>Physical memory for the system (in MB)</td>
+ *          <td> e.g. 4096</td>
+ *       </tr>
+ *       </table>
+ *  </blockquote>
+ * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.
+ * If an element is not available on a system and their value will be
+ * empty.
+ * <p>
+ * <a name="XMLSchema">
+ * <b>Registration XML Schema</b></a>
+ * <p>
+ * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from 
+ * and {@link #storeToXML stored} into an XML file in the format described 
+ * by the
+ * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">
+ * registration data schema</a>.  The registration data schema is defined by the 
+ * Service Tags Technology.
+ * <p>
+ * Typically the registration data is constructed at installation time
+ * and stored in an XML file for later service tag lookup or registration.
+ * 
+ * <p>
+ * <b>Example Usage</b>
+ * <p>
+ * The examples below show how the {@code RegistrationData} can be 
+ * used for product registration.
+ * Exception handling is not shown in these examples for clarity.
+ * <ol>
+ * <li>This example shows how the JDK creates a JDK service tag, installs it
+ * in the system service tag registry and adds it to the registration data.
+ * <br>
+ * <blockquote><pre>
+ *   // create a service tag object with an instance_urn
+ *   ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
+ *                                          ....);
+ *   // Adds to the system service tag registry if supported
+ *   if (Registry.isSupported()) {
+ *       Registry.getSystemRegistry().addServiceTag(st);
+ *   }
+ * 
+ *   // add to the registration data
+ *   RegistrationData registration  = new RegistrationData();
+ *   registration.addServiceTag(st); 
+ * </pre></blockquote>
+ * </li>
+ * <li>At this point, the registration data is ready to 
+ * send to Sun Connection for registration. This example shows how to register 
+ * the JDK via the <i>Registration Relay Service</i>.
+ * <p>
+ * There are several registration services for Sun Connection. For example,
+ * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">
+ * Registration Relay Service</a> is a web application interface that
+ * processes the registration data payload sent via HTTP post
+ * and hosts the registration user interface for a specified 
+ * registration URL.  Refer to the 
+ * Registration Relay Service Specification for details.
+ * <p>
+ * <blockquote><pre>
+ *   // Open the connection to the URL of the registration service
+ *   HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+ *   con.setDoInput(true);
+ *   con.setDoOutput(true);
+ *   con.setUseCaches(false);
+ *   con.setAllowUserInteraction(false);
+ *   con.setRequestMethod("POST");
+ *   con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
+ *   con.connect();
+ *
+ *   // send the registration data to the registration service
+ *   OutputStream out = con.getOutputStream();
+ *   registration.storeToXML(out);
+ *   out.close();
+ * </pre></blockquote>
+ * </li>
+ * <li>This example shows how to store the registration data in an XML file.
+ *     for later service tag lookup or registration.
+ * <br>
+ * <blockquote><pre>
+ *   BufferedOutputStream out = new BufferedOutputStream(
+ *       new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));
+ *   registration.storeToXML(out);
+ *   out.close();
+ * </pre></blockquote>
+ * </li> 
+ * <li>This example shows how to install service tags that are in the 
+ * registration data in the system service tag registry when determined
+ * to be available.  The system service tag registry might not have existed 
+ * when the registration data was constructed.
+ * <br>
+ * <blockquote><pre>
+ *   if (Registry.isSupported()) {
+ *       Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();
+ *       for (ServiceTag st : svctags) {
+ *           Registry.getSystemRegistry().addServiceTag(st);
+ *       }
+ *   }
+ * </pre></blockquote>
+ * </li>
+ * </ol>
+ * 
+ * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>
+ */
+public class RegistrationData {
+    private final Map<String, String> environment;
+    private final Map<String, String> cpuInfo;
+    private final Map<String, ServiceTag> svcTagMap;
+    private final String urn;
+
+    /**
+     * Creates a {@code RegistrationData} object with a generated
+     * {@link #getRegistrationURN registration URN}.
+     * The following keys in the {@link #getEnvironmentMap environment map}
+     * will be initialized for the configuration of the 
+     * running system:
+     * <blockquote>
+     * <tt>hostname</tt>, <tt>osName</tt>,  <tt>osVersion</tt> and
+     * <tt>osArchitecture</tt>
+     * </blockquote>
+     * and the value of other keys may be empty.
+     */
+    public RegistrationData() {
+        this(Util.generateURN());
+    }
+    
+    // package private
+    RegistrationData(String urn) {
+        this.urn = urn;
+        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();
+        this.environment = initEnvironment(sysEnv);
+        this.cpuInfo = initCpuInfo(sysEnv);
+        this.svcTagMap = new LinkedHashMap<String, ServiceTag>();
+    }
+    
+    private Map<String, String> initEnvironment(SystemEnvironment sysEnv) {
+        Map<String, String> map = new LinkedHashMap<String, String>();
+        map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());
+        map.put(ST_NODE_HOST_ID, sysEnv.getHostId());
+        map.put(ST_NODE_OS_NAME, sysEnv.getOsName());
+        map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());
+        map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());
+        map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());
+        map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());
+        map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());
+        map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());
+        map.put(ST_NODE_PHYS_MEM, sysEnv.getPhysMem());
+        return map;
+    }  
+
+    private Map<String, String> initCpuInfo(SystemEnvironment sysEnv) {
+        Map<String, String> map = new LinkedHashMap<String, String>();
+        map.put(ST_NODE_SOCKETS, sysEnv.getSockets());
+        map.put(ST_NODE_CORES, sysEnv.getCores());
+        map.put(ST_NODE_VIRT_CPUS, sysEnv.getVirtCpus());
+        map.put(ST_NODE_CPU_NAME, sysEnv.getCpuName());
+        map.put(ST_NODE_CLOCK_RATE, sysEnv.getClockRate());
+        return map;
+    }  
+    
+    /**
+     * Returns the uniform resource name of this registration data
+     * in this format:
+     * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>
+     * 
+     * @return the URN of this registration data.
+     */
+    public String getRegistrationURN() {
+        return urn;
+    }
+
+    /**
+     * Returns a map containing the environment information for this
+     * registration data.  See the set of <a href="#EnvMap">keys</a>
+     * in the environment map. Subsequent update to the environment
+     * map via the {@link #setEnvironment setEnvironment} method will not be reflected
+     * in the returned map.
+     * 
+     * @return an environment map for this registration data. 
+     */
+    public Map<String, String> getEnvironmentMap() {
+        return new LinkedHashMap<String,String>(environment);
+    }
+
+    /**
+     * Returns a map containing the cpu information for this
+     * registration data.  Subsequent update to the cpu info
+     * map via the {@link #setCpuInfo setCpuInfo} method will not be reflected
+     * in the returned map.
+     *
+     * @return a cpu info map for this registration data.
+     */
+    public Map<String, String> getCpuInfoMap() {
+        return new LinkedHashMap<String,String>(cpuInfo);
+    }
+
+    /**
+     * Sets an element of the specified {@code name} in the environment map 
+     * with the given {@code value}.
+     * 
+     * @throws IllegalArgumentException if {@code name} is not a valid key
+     * in the environment map, or {@code value} is not valid.
+     */
+    public void setEnvironment(String name, String value) {    
+        if (name == null) {
+            throw new NullPointerException("name is null");
+        }
+        if (value == null) {
+            throw new NullPointerException("value is null");
+        }
+        if (environment.containsKey(name)) {
+            if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {
+                if (value.length() == 0) {
+                    throw new IllegalArgumentException("\"" +
+                        name + "\" requires non-empty value.");
+                }
+            }
+            environment.put(name, value);
+        } else {
+            throw new IllegalArgumentException("\"" +
+                 name + "\" is not an environment element.");
+        }   
+    }
+
+    /**
+     * Sets an element of the specified {@code name} in the cpu info map
+     * with the given {@code value}.
+     *
+     * @throws IllegalArgumentException if {@code name} is not a valid key
+     * in the cpu info map, or {@code value} is not valid.
+     */
+    public void setCpuInfo(String name, String value) {    
+        if (name == null) {
+            throw new NullPointerException("name is null");
+        }
+        if (value == null) {
+            throw new NullPointerException("value is null");
+        }
+        if (cpuInfo.containsKey(name)) {
+            cpuInfo.put(name, value);
+        } else {
+            throw new IllegalArgumentException("\"" +
+                 name + "\" is not an cpuinfo element.");
+        }   
+    }
+
+    /**
+     * Returns all service tags in this registration data.
+     * 
+     * @return  a {@link Set Set} of the service tags
+     * in this registration data.
+     */
+    public Set<ServiceTag> getServiceTags() {
+        return new HashSet<ServiceTag>(svcTagMap.values());
+    }
+
+    /**
+     * Adds a service tag to this registration data. 
+     * If the given service tag has an empty <tt>instance_urn</tt>,
+     * this method will generate a URN and place it in the copy 
+     * of the service tag in this registration data. 
+     * This method will return the {@code ServiceTag} object
+     * added to this registration data.
+     * 
+     * @param st {@code ServiceTag} object to be added.
+     * @return a {@code ServiceTag} object added to this registration data.
+     * 
+     * @throws IllegalArgumentException if 
+     *   a service tag of the same {@link ServiceTag#getInstanceURN 
+     *   <tt>instance_urn</tt>} already exists in the registry.
+     */
+    public synchronized ServiceTag addServiceTag(ServiceTag st) {
+        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);
+        
+        String instanceURN = svcTag.getInstanceURN();
+        if (svcTagMap.containsKey(instanceURN)) {
+            throw new IllegalArgumentException("Instance_urn = " + instanceURN +
+                    " already exists in the registration data.");
+        } else {
+            svcTagMap.put(instanceURN, svcTag);
+        }
+        return svcTag;
+    }
+
+    /**
+     * Returns a service tag of the given <tt>instance_urn</tt> in this registration
+     * data.
+     *
+     * @param instanceURN the <tt>instance_urn</tt> of the service tag
+     * @return the {@code ServiceTag} object of the given  <tt>instance_urn</tt>
+     *         if exists; otherwise return {@code null}.
+     */
+    public synchronized ServiceTag getServiceTag(String instanceURN) {
+        if (instanceURN == null) {
+            throw new NullPointerException("instanceURN is null");
+        }
+        return svcTagMap.get(instanceURN);
+    }
+
+    /**
+     * Removes a service tag of the given <tt>instance_urn</tt> from this 
+     * registration data.
+     *
+     * @param instanceURN the <tt>instance_urn</tt> of 
+     * the service tag to be removed.
+     *
+     * @return the removed {@code ServiceTag} object;
+     * or {@code null} if the service tag does not exist in this 
+     * registration data.
+     */
+    public synchronized ServiceTag removeServiceTag(String instanceURN) {
+        if (instanceURN == null) {
+            throw new NullPointerException("instanceURN is null");
+        }
+
+        ServiceTag svcTag = null;
+        if (svcTagMap.containsKey(instanceURN)) {
+            svcTag = svcTagMap.remove(instanceURN);
+        }
+        return svcTag;
+    }
+
+     /**
+     * Updates the <tt>product_defined_instance_id</tt> in the service tag 
+     * of the given <tt>instance_urn</tt> in this registration data.
+     * 
+     * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
+     * @param productDefinedInstanceID the value of the
+     * <tt>product_defined_instance_id</tt> to be set.
+     * 
+     * @return the updated {@code ServiceTag} object;
+     * or {@code null} if the service tag does not exist in this 
+     * registration data.
+     */
+    public synchronized ServiceTag updateServiceTag(String instanceURN,
+                                                    String productDefinedInstanceID) {
+        ServiceTag svcTag = getServiceTag(instanceURN);
+        if (svcTag == null) {
+            return null;
+        }
+
+        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);
+        // update the product defined instance ID field
+        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);
+        svcTagMap.put(instanceURN, svcTag);
+        return svcTag;
+    }
+    
+    /**
+     * Reads the registration data from the XML document on the 
+     * specified input stream.  The XML document must be 
+     * in the format described by the <a href="#XMLSchema">
+     * registration data schema</a>.
+     * The specified stream is closed after this method returns.
+     * 
+     * @param in the input stream from which to read the XML document.
+     * @return a {@code RegistrationData} object read from the input
+     * stream.
+     * 
+     * @throws IllegalArgumentException if the input stream 
+     * contains an invalid registration data.
+     * 
+     * @throws IOException if an error occurred when reading from the input stream.
+     */
+    public static RegistrationData loadFromXML(InputStream in) throws IOException {
+        try {
+            return RegistrationDocument.load(in);
+        } finally {
+            in.close();
+        }
+    }
+    
+    /**
+     * Writes the registration data to the specified output stream 
+     * in the format described by the <a href="#XMLSchema">
+     * registration data schema</a> with "UTF-8" encoding.
+     * The specified stream remains open after this method returns.
+     * 
+     * @param os the output stream on which to write the XML document.
+     * 
+     * @throws IOException if an error occurred when writing to the output stream.
+     */
+    public void storeToXML(OutputStream os) throws IOException {
+        RegistrationDocument.store(os, this);
+        os.flush();
+    }
+
+    /** 
+     * Returns a newly allocated byte array containing the registration
+     * data in XML format.
+     *
+     * @return a newly allocated byte array containing the registration
+     * data in XML format.
+     */
+    public byte[] toXML() {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            storeToXML(out);
+            return out.toByteArray();
+        } catch (IOException e) {
+            // should not reach here
+            return new byte[0];
+        }
+    }
+
+    /**
+     * Returns a string representation of this registration data in XML
+     * format.
+     * 
+     * @return a string representation of this registration data in XML
+     *         format.
+     */
+    @Override
+    public String toString() {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            storeToXML(out);
+            return out.toString("UTF-8");
+        } catch (IOException e) {
+            // should not reach here
+            return "Error creating the return string.";
+        }
+    }
+}
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
index 93a1f25a6c..4bfa1aa16a 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
@@ -1,440 +1,440 @@
-

-/*

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

- *

- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

- *

- * The contents of this file are subject to the terms of either the GNU

- * General Public License Version 2 only ("GPL") or the Common Development

- * and Distribution License("CDDL") (collectively, the "License").  You

- * may not use this file except in compliance with the License. You can obtain

- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html

- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific

- * language governing permissions and limitations under the License.

- *

- * When distributing the software, include this License Header Notice in each

- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.

- * Sun designates this particular file as subject to the "Classpath" exception

- * as provided by Sun in the GPL Version 2 section of the License file that

- * accompanied this code.  If applicable, add the following below the License

- * Header, with the fields enclosed by brackets [] replaced by your own

- * identifying information: "Portions Copyrighted [year]

- * [name of copyright owner]"

- *

- * Contributor(s):

- *

- * If you wish your version of this file to be governed by only the CDDL or

- * only the GPL Version 2, indicate your decision by adding "[Contributor]

- * elects to include this software in this distribution under the [CDDL or GPL

- * Version 2] license."  If you don't indicate a single choice of license, a

- * recipient has the option to distribute your version of this file under

- * either the CDDL, the GPL Version 2 or to extend the choice of license to

- * its licensees as provided above.  However, if you add GPL Version 2 code

- * and therefore, elected the GPL Version 2 license, then the option applies

- * only if the new code is made subject to such option by the copyright

- * holder.

- */

-

-package com.sun.star.servicetag;

-

-import java.io.*;

-import java.net.URL;

-import java.util.Collection;

-import java.util.Map;

-import java.util.Set;

-

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-import org.xml.sax.SAXException;

-import org.xml.sax.InputSource;

-

-import javax.xml.XMLConstants;

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-

-import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.validation.Schema;

-import javax.xml.validation.SchemaFactory;

-import javax.xml.validation.Validator;

-

-// For write operation

-import javax.xml.transform.OutputKeys;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerException;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.TransformerConfigurationException;

-import javax.xml.transform.dom.DOMSource;

-import javax.xml.transform.stream.StreamResult;

-

-/**

- * XML Support Class for Product Registration.

- */

-class RegistrationDocument {

-

-    private static final String REGISTRATION_DATA_SCHEMA =

-            "/com/sun/star/servicetag/resources/product_registration.xsd";

-    private static final String REGISTRATION_DATA_VERSION = "1.0";

-    private static final String SERVICE_TAG_VERSION = "1.0";

-    final static String ST_NODE_REGISTRATION_DATA = "registration_data";

-    final static String ST_ATTR_REGISTRATION_VERSION = "version";

-    final static String ST_NODE_ENVIRONMENT = "environment";

-    final static String ST_NODE_HOSTNAME = "hostname";

-    final static String ST_NODE_HOST_ID = "hostId";

-    final static String ST_NODE_OS_NAME = "osName";

-    final static String ST_NODE_OS_VERSION = "osVersion";

-    final static String ST_NODE_OS_ARCH = "osArchitecture";

-    final static String ST_NODE_SYSTEM_MODEL = "systemModel";

-    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";

-    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";

-    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";

-    final static String ST_NODE_PHYS_MEM = "physmem";

-    final static String ST_NODE_CPU_INFO = "cpuinfo";

-    final static String ST_NODE_SOCKETS = "sockets";

-    final static String ST_NODE_CORES = "cores";

-    final static String ST_NODE_VIRT_CPUS = "virtcpus";

-    final static String ST_NODE_CPU_NAME = "name";

-    final static String ST_NODE_CLOCK_RATE = "clockrate";

-    final static String ST_NODE_REGISTRY = "registry";

-    final static String ST_ATTR_REGISTRY_URN = "urn";

-    final static String ST_ATTR_REGISTRY_VERSION = "version";

-    final static String ST_NODE_SERVICE_TAG = "service_tag";

-    final static String ST_NODE_INSTANCE_URN = "instance_urn";

-    final static String ST_NODE_PRODUCT_NAME = "product_name";

-    final static String ST_NODE_PRODUCT_VERSION = "product_version";

-    final static String ST_NODE_PRODUCT_URN = "product_urn";

-    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";

-    final static String ST_NODE_PRODUCT_PARENT = "product_parent";

-    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";

-    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";

-    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";

-    final static String ST_NODE_TIMESTAMP = "timestamp";

-    final static String ST_NODE_CONTAINER = "container";

-    final static String ST_NODE_SOURCE = "source";

-    final static String ST_NODE_INSTALLER_UID = "installer_uid";

-

-    static RegistrationData load(InputStream in) throws IOException {

-        Document document = initializeDocument(in);

-        

-        // Gets the registration URN

-        Element root = getRegistrationDataRoot(document);

-        Element registryRoot =

-                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);

-        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);

-        

-        // Construct a new RegistrationData object from the DOM tree

-        // Initialize the environment map and service tags

-        RegistrationData regData = new RegistrationData(urn);

-        addServiceTags(registryRoot, regData);

-

-        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);

-        buildEnvironmentMap(envRoot, regData);

-

-        Element cpuInfo = getSingletonElementFromRoot(envRoot, ST_NODE_CPU_INFO);

-        buildCpuInfoMap(cpuInfo, regData);

-        return regData;

-    }

-

-    static void store(OutputStream os, RegistrationData registration) 

-            throws IOException {

-        // create a new document with the root node

-        Document document = initializeDocument();

-

-        // create the nodes for the environment map and the service tags

-        // in the registration data

-        addEnvironmentNodes(document,

-                            registration.getEnvironmentMap(),

-                            registration.getCpuInfoMap());

-        addServiceTagRegistry(document, 

-                              registration.getRegistrationURN(),

-                              registration.getServiceTags());

-        transform(document, os);

-    }

-

-    // initialize a document from an input stream 

-    private static Document initializeDocument(InputStream in) throws IOException {

-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

-        SchemaFactory sf = null;

-        try {

-            // Some Java versions (e.g., 1.5.0_06-b05) fail with a

-            // NullPointerException if SchemaFactory.newInstance is called with

-            // a null context class loader, so work around that here (and the

-            // class loader of this class hopefully is not the null bootstrap

-            // class loader):

-            ClassLoader cl = Thread.currentThread().getContextClassLoader();

-            if (cl == null) {

-                Thread.currentThread().setContextClassLoader(

-                    RegistrationDocument.class.getClassLoader());

-            }

-            try {

-               sf = SchemaFactory.newInstance(

-                   XMLConstants.W3C_XML_SCHEMA_NS_URI);

-            } finally {

-               Thread.currentThread().setContextClassLoader(cl);

-            }

-

-            Schema schema = null;

-            try {

-                // Even using the workaround above is not enough on some

-                // Java versions. Therefore try to workaround the validation

-                // completely!

-                URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);

-                schema = sf.newSchema(xsdUrl);

-            }

-        catch (NullPointerException nex) {

-        }

-            

-            Validator validator = null;

-            if (schema != null)

-                validator = schema.newValidator();

-

-            DocumentBuilder builder = factory.newDocumentBuilder();

-            Document doc = builder.parse(new InputSource(in));

-            

-            if (validator != null)

-                validator.validate(new DOMSource(doc));

-            

-            return doc;

-        } catch (SAXException sxe) {

-            IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");

-            e.initCause(sxe);

-            throw e;

-        } catch (ParserConfigurationException pce) {

-            // Parser with specific options can't be built

-            // should not reach here

-            InternalError x = new InternalError("Error in creating the new document");

-            x.initCause(pce);

-            throw x;

-        }

-    }

-

-    // initialize a new document for the registration data

-    private static Document initializeDocument() throws IOException {

-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

-        try {

-            DocumentBuilder builder = factory.newDocumentBuilder();

-            Document doc = builder.newDocument();

-

-            // initialize the document with the registration_data root

-            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);

-            doc.appendChild(root);

-            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);

-

-            return doc;

-        } catch (ParserConfigurationException pce) {

-            // Parser with specified options can't be built

-            // should not reach here

-            InternalError x = new InternalError("Error in creating the new document");

-            x.initCause(pce);

-            throw x;

-        }

-    }

-

-    // Transform the current DOM tree with the given output stream.

-    private static void transform(Document document, OutputStream os) {

-        try {

-            // Use a Transformer for output

-            TransformerFactory tFactory = TransformerFactory.newInstance();

-            tFactory.setAttribute("indent-number", new Integer(3));

-

-            Transformer transformer = tFactory.newTransformer();

-

-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");

-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");

-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");

-            transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");

-            transformer.transform(new DOMSource(document),

-                new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));

-        } catch (UnsupportedEncodingException ue) {

-            // Should not reach here

-            InternalError x = new InternalError("Error generated during transformation");

-            x.initCause(ue);

-            throw x;

-        } catch (TransformerConfigurationException tce) {

-            // Error generated by the parser

-            // Should not reach here

-            InternalError x = new InternalError("Error in creating the new document");

-            x.initCause(tce);

-            throw x;

-        } catch (TransformerException te) {

-            // Error generated by the transformer

-            InternalError x = new InternalError("Error generated during transformation");

-            x.initCause(te);

-            throw x;

-        }

-    }

-

-    private static void addServiceTagRegistry(Document document, 

-                                              String registryURN,

-                                              Set<ServiceTag> svcTags) {

-        // add service tag registry node and its attributes

-        Element reg = document.createElement(ST_NODE_REGISTRY);

-        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);

-        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);

-        

-        Element root = getRegistrationDataRoot(document);

-        root.appendChild(reg);

-        

-        // adds the elements for the service tags

-        for (ServiceTag st : svcTags) {

-            addServiceTagElement(document, reg, st);

-        }

-    }

-

-    private static void addServiceTagElement(Document document, 

-                                             Element registryRoot,

-                                             ServiceTag st) {

-        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);

-        registryRoot.appendChild(svcTag);

-        addChildElement(document, svcTag,

-                        ST_NODE_INSTANCE_URN, st.getInstanceURN());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_NAME, st.getProductName());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_URN, st.getProductURN());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_PARENT, st.getProductParent());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_DEFINED_INST_ID,

-                        st.getProductDefinedInstanceID());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());

-        addChildElement(document, svcTag,

-                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());

-        addChildElement(document, svcTag,

-                        ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));

-        addChildElement(document, svcTag,

-                        ST_NODE_CONTAINER, st.getContainer());

-        addChildElement(document, svcTag,

-                        ST_NODE_SOURCE, st.getSource());

-        addChildElement(document, svcTag,

-                        ST_NODE_INSTALLER_UID,

-                        String.valueOf(st.getInstallerUID()));

-    }

-

-    private static void addChildElement(Document document, Element root,

-                                        String element, String text) {

-        Element node = document.createElement(element);

-        node.appendChild(document.createTextNode(text));

-        root.appendChild(node);

-    }

-

-    // Constructs service tags from the document

-    private static void addServiceTags(Element registryRoot,

-                                       RegistrationData registration) {

-        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);

-        int length = (children == null ? 0 : children.getLength());

-        for (int i = 0; i < length; i++) {

-            Element svcTagElement = (Element) children.item(i);

-            ServiceTag st = getServiceTag(svcTagElement);

-            registration.addServiceTag(st);

-        }

-    }

-

-    // build environment map from the document

-    private static void buildEnvironmentMap(Element envRoot, 

-                                         RegistrationData registration) {

-        registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));

-        registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));

-        registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));

-        registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));

-        registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));

-        registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));

-        registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));

-        registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));

-        registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));

-        registration.setEnvironment(ST_NODE_PHYS_MEM, getTextValue(envRoot, ST_NODE_PHYS_MEM));

-    }

-

-    private static void buildCpuInfoMap(Element cpuInfoRoot, 

-                                         RegistrationData registration) {

-        registration.setCpuInfo(ST_NODE_SOCKETS, getTextValue(cpuInfoRoot, ST_NODE_SOCKETS));

-        registration.setCpuInfo(ST_NODE_CORES, getTextValue(cpuInfoRoot, ST_NODE_CORES));

-        registration.setCpuInfo(ST_NODE_VIRT_CPUS, getTextValue(cpuInfoRoot, ST_NODE_VIRT_CPUS));

-        registration.setCpuInfo(ST_NODE_CPU_NAME, getTextValue(cpuInfoRoot, ST_NODE_CPU_NAME));

-        registration.setCpuInfo(ST_NODE_CLOCK_RATE, getTextValue(cpuInfoRoot, ST_NODE_CLOCK_RATE));

-    }

-

-    // add the nodes representing the environment map in the document

-    private static void addEnvironmentNodes(Document document,

-                                            Map<String, String> envMap,

-                                            Map<String, String> cpuInfoMap) {

-        Element root = getRegistrationDataRoot(document);

-

-        Element env = document.createElement(ST_NODE_ENVIRONMENT);

-        root.appendChild(env);

-        Set<Map.Entry<String, String>> keys = envMap.entrySet();

-        for (Map.Entry<String, String> entry : keys) {

-            addChildElement(document, env, entry.getKey(), entry.getValue());

-        }

-

-        Element cpuInfo = document.createElement(ST_NODE_CPU_INFO);

-        env.appendChild(cpuInfo);

-        keys = cpuInfoMap.entrySet();

-        for (Map.Entry<String, String> entry : keys) {

-            addChildElement(document, cpuInfo, entry.getKey(), entry.getValue());

-        }

-    }

-

-    private static Element getRegistrationDataRoot(Document doc) {

-        Element root = doc.getDocumentElement();

-        if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {

-            throw new IllegalArgumentException("Not a " + 

-                    ST_NODE_REGISTRATION_DATA +

-                    " node \"" + root.getNodeName() + "\"");

-        }

-        return root;

-    }

-

-    private static Element getSingletonElementFromRoot(Element root, String name) {

-        NodeList children = root.getElementsByTagName(name);

-        int length = (children == null ? 0 : children.getLength());

-        if (length != 1) {

-            throw new IllegalArgumentException("Invalid number of " + name +

-                    " nodes = " + length);

-        }

-        Element e = (Element) children.item(0);

-        if (!e.getNodeName().equals(name)) {

-            throw new IllegalArgumentException("Not a  " + name +

-                    " node \"" + e.getNodeName() + "\"");

-        }

-        return e;

-    }

-

-    // Constructs one ServiceTag instance from a service tag element root

-    private static ServiceTag getServiceTag(Element svcTagElement) {

-        return new ServiceTag(

-            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),

-            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),

-            getTextValue(svcTagElement, ST_NODE_CONTAINER),

-            getTextValue(svcTagElement, ST_NODE_SOURCE),   

-            Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),

-            Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))

-        );

-    }

-

-    private static String getTextValue(Element e, String tagName) {

-        String value = "";

-        NodeList nl = e.getElementsByTagName(tagName);

-        if (nl != null && nl.getLength() > 0) {

-            Element el = (Element) nl.item(0);

-            Node node = el.getFirstChild();

-            if (node != null) {

-                value = node.getNodeValue();

-            }

-        }

-        return value;

-    }

-}

+
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code.  If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.star.servicetag;
+
+import java.io.*;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+import org.xml.sax.InputSource;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+// For write operation
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+/**
+ * XML Support Class for Product Registration.
+ */
+class RegistrationDocument {
+
+    private static final String REGISTRATION_DATA_SCHEMA =
+            "/com/sun/star/servicetag/resources/product_registration.xsd";
+    private static final String REGISTRATION_DATA_VERSION = "1.0";
+    private static final String SERVICE_TAG_VERSION = "1.0";
+    final static String ST_NODE_REGISTRATION_DATA = "registration_data";
+    final static String ST_ATTR_REGISTRATION_VERSION = "version";
+    final static String ST_NODE_ENVIRONMENT = "environment";
+    final static String ST_NODE_HOSTNAME = "hostname";
+    final static String ST_NODE_HOST_ID = "hostId";
+    final static String ST_NODE_OS_NAME = "osName";
+    final static String ST_NODE_OS_VERSION = "osVersion";
+    final static String ST_NODE_OS_ARCH = "osArchitecture";
+    final static String ST_NODE_SYSTEM_MODEL = "systemModel";
+    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";
+    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";
+    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";
+    final static String ST_NODE_PHYS_MEM = "physmem";
+    final static String ST_NODE_CPU_INFO = "cpuinfo";
+    final static String ST_NODE_SOCKETS = "sockets";
+    final static String ST_NODE_CORES = "cores";
+    final static String ST_NODE_VIRT_CPUS = "virtcpus";
+    final static String ST_NODE_CPU_NAME = "name";
+    final static String ST_NODE_CLOCK_RATE = "clockrate";
+    final static String ST_NODE_REGISTRY = "registry";
+    final static String ST_ATTR_REGISTRY_URN = "urn";
+    final static String ST_ATTR_REGISTRY_VERSION = "version";
+    final static String ST_NODE_SERVICE_TAG = "service_tag";
+    final static String ST_NODE_INSTANCE_URN = "instance_urn";
+    final static String ST_NODE_PRODUCT_NAME = "product_name";
+    final static String ST_NODE_PRODUCT_VERSION = "product_version";
+    final static String ST_NODE_PRODUCT_URN = "product_urn";
+    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";
+    final static String ST_NODE_PRODUCT_PARENT = "product_parent";
+    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";
+    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";
+    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";
+    final static String ST_NODE_TIMESTAMP = "timestamp";
+    final static String ST_NODE_CONTAINER = "container";
+    final static String ST_NODE_SOURCE = "source";
+    final static String ST_NODE_INSTALLER_UID = "installer_uid";
+
+    static RegistrationData load(InputStream in) throws IOException {
+        Document document = initializeDocument(in);
+        
+        // Gets the registration URN
+        Element root = getRegistrationDataRoot(document);
+        Element registryRoot =
+                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);
+        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);
+        
+        // Construct a new RegistrationData object from the DOM tree
+        // Initialize the environment map and service tags
+        RegistrationData regData = new RegistrationData(urn);
+        addServiceTags(registryRoot, regData);
+
+        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);
+        buildEnvironmentMap(envRoot, regData);
+
+        Element cpuInfo = getSingletonElementFromRoot(envRoot, ST_NODE_CPU_INFO);
+        buildCpuInfoMap(cpuInfo, regData);
+        return regData;
+    }
+
+    static void store(OutputStream os, RegistrationData registration) 
+            throws IOException {
+        // create a new document with the root node
+        Document document = initializeDocument();
+
+        // create the nodes for the environment map and the service tags
+        // in the registration data
+        addEnvironmentNodes(document,
+                            registration.getEnvironmentMap(),
+                            registration.getCpuInfoMap());
+        addServiceTagRegistry(document, 
+                              registration.getRegistrationURN(),
+                              registration.getServiceTags());
+        transform(document, os);
+    }
+
+    // initialize a document from an input stream 
+    private static Document initializeDocument(InputStream in) throws IOException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        SchemaFactory sf = null;
+        try {
+            // Some Java versions (e.g., 1.5.0_06-b05) fail with a
+            // NullPointerException if SchemaFactory.newInstance is called with
+            // a null context class loader, so work around that here (and the
+            // class loader of this class hopefully is not the null bootstrap
+            // class loader):
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            if (cl == null) {
+                Thread.currentThread().setContextClassLoader(
+                    RegistrationDocument.class.getClassLoader());
+            }
+            try {
+               sf = SchemaFactory.newInstance(
+                   XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            } finally {
+               Thread.currentThread().setContextClassLoader(cl);
+            }
+
+            Schema schema = null;
+            try {
+                // Even using the workaround above is not enough on some
+                // Java versions. Therefore try to workaround the validation
+                // completely!
+                URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);
+                schema = sf.newSchema(xsdUrl);
+            }
+        catch (NullPointerException nex) {
+        }
+            
+            Validator validator = null;
+            if (schema != null)
+                validator = schema.newValidator();
+
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.parse(new InputSource(in));
+            
+            if (validator != null)
+                validator.validate(new DOMSource(doc));
+            
+            return doc;
+        } catch (SAXException sxe) {
+            IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");
+            e.initCause(sxe);
+            throw e;
+        } catch (ParserConfigurationException pce) {
+            // Parser with specific options can't be built
+            // should not reach here
+            InternalError x = new InternalError("Error in creating the new document");
+            x.initCause(pce);
+            throw x;
+        }
+    }
+
+    // initialize a new document for the registration data
+    private static Document initializeDocument() throws IOException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        try {
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.newDocument();
+
+            // initialize the document with the registration_data root
+            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);
+            doc.appendChild(root);
+            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);
+
+            return doc;
+        } catch (ParserConfigurationException pce) {
+            // Parser with specified options can't be built
+            // should not reach here
+            InternalError x = new InternalError("Error in creating the new document");
+            x.initCause(pce);
+            throw x;
+        }
+    }
+
+    // Transform the current DOM tree with the given output stream.
+    private static void transform(Document document, OutputStream os) {
+        try {
+            // Use a Transformer for output
+            TransformerFactory tFactory = TransformerFactory.newInstance();
+            tFactory.setAttribute("indent-number", new Integer(3));
+
+            Transformer transformer = tFactory.newTransformer();
+
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
+            transformer.transform(new DOMSource(document),
+                new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));
+        } catch (UnsupportedEncodingException ue) {
+            // Should not reach here
+            InternalError x = new InternalError("Error generated during transformation");
+            x.initCause(ue);
+            throw x;
+        } catch (TransformerConfigurationException tce) {
+            // Error generated by the parser
+            // Should not reach here
+            InternalError x = new InternalError("Error in creating the new document");
+            x.initCause(tce);
+            throw x;
+        } catch (TransformerException te) {
+            // Error generated by the transformer
+            InternalError x = new InternalError("Error generated during transformation");
+            x.initCause(te);
+            throw x;
+        }
+    }
+
+    private static void addServiceTagRegistry(Document document, 
+                                              String registryURN,
+                                              Set<ServiceTag> svcTags) {
+        // add service tag registry node and its attributes
+        Element reg = document.createElement(ST_NODE_REGISTRY);
+        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);
+        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);
+        
+        Element root = getRegistrationDataRoot(document);
+        root.appendChild(reg);
+        
+        // adds the elements for the service tags
+        for (ServiceTag st : svcTags) {
+            addServiceTagElement(document, reg, st);
+        }
+    }
+
+    private static void addServiceTagElement(Document document, 
+                                             Element registryRoot,
+                                             ServiceTag st) {
+        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);
+        registryRoot.appendChild(svcTag);
+        addChildElement(document, svcTag,
+                        ST_NODE_INSTANCE_URN, st.getInstanceURN());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_NAME, st.getProductName());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_URN, st.getProductURN());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_PARENT, st.getProductParent());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_DEFINED_INST_ID,
+                        st.getProductDefinedInstanceID());
+        addChildElement(document, svcTag,
+                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());
+        addChildElement(document, svcTag,
+                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());
+        addChildElement(document, svcTag,
+                        ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));
+        addChildElement(document, svcTag,
+                        ST_NODE_CONTAINER, st.getContainer());
+        addChildElement(document, svcTag,
+                        ST_NODE_SOURCE, st.getSource());
+        addChildElement(document, svcTag,
+                        ST_NODE_INSTALLER_UID,
+                        String.valueOf(st.getInstallerUID()));
+    }
+
+    private static void addChildElement(Document document, Element root,
+                                        String element, String text) {
+        Element node = document.createElement(element);
+        node.appendChild(document.createTextNode(text));
+        root.appendChild(node);
+    }
+
+    // Constructs service tags from the document
+    private static void addServiceTags(Element registryRoot,
+                                       RegistrationData registration) {
+        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);
+        int length = (children == null ? 0 : children.getLength());
+        for (int i = 0; i < length; i++) {
+            Element svcTagElement = (Element) children.item(i);
+            ServiceTag st = getServiceTag(svcTagElement);
+            registration.addServiceTag(st);
+        }
+    }
+
+    // build environment map from the document
+    private static void buildEnvironmentMap(Element envRoot, 
+                                         RegistrationData registration) {
+        registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));
+        registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));
+        registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));
+        registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));
+        registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));
+        registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));
+        registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));
+        registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));
+        registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));
+        registration.setEnvironment(ST_NODE_PHYS_MEM, getTextValue(envRoot, ST_NODE_PHYS_MEM));
+    }
+
+    private static void buildCpuInfoMap(Element cpuInfoRoot, 
+                                         RegistrationData registration) {
+        registration.setCpuInfo(ST_NODE_SOCKETS, getTextValue(cpuInfoRoot, ST_NODE_SOCKETS));
+        registration.setCpuInfo(ST_NODE_CORES, getTextValue(cpuInfoRoot, ST_NODE_CORES));
+        registration.setCpuInfo(ST_NODE_VIRT_CPUS, getTextValue(cpuInfoRoot, ST_NODE_VIRT_CPUS));
+        registration.setCpuInfo(ST_NODE_CPU_NAME, getTextValue(cpuInfoRoot, ST_NODE_CPU_NAME));
+        registration.setCpuInfo(ST_NODE_CLOCK_RATE, getTextValue(cpuInfoRoot, ST_NODE_CLOCK_RATE));
+    }
+
+    // add the nodes representing the environment map in the document
+    private static void addEnvironmentNodes(Document document,
+                                            Map<String, String> envMap,
+                                            Map<String, String> cpuInfoMap) {
+        Element root = getRegistrationDataRoot(document);
+
+        Element env = document.createElement(ST_NODE_ENVIRONMENT);
+        root.appendChild(env);
+        Set<Map.Entry<String, String>> keys = envMap.entrySet();
+        for (Map.Entry<String, String> entry : keys) {
+            addChildElement(document, env, entry.getKey(), entry.getValue());
+        }
+
+        Element cpuInfo = document.createElement(ST_NODE_CPU_INFO);
+        env.appendChild(cpuInfo);
+        keys = cpuInfoMap.entrySet();
+        for (Map.Entry<String, String> entry : keys) {
+            addChildElement(document, cpuInfo, entry.getKey(), entry.getValue());
+        }
+    }
+
+    private static Element getRegistrationDataRoot(Document doc) {
+        Element root = doc.getDocumentElement();
+        if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {
+            throw new IllegalArgumentException("Not a " + 
+                    ST_NODE_REGISTRATION_DATA +
+                    " node \"" + root.getNodeName() + "\"");
+        }
+        return root;
+    }
+
+    private static Element getSingletonElementFromRoot(Element root, String name) {
+        NodeList children = root.getElementsByTagName(name);
+        int length = (children == null ? 0 : children.getLength());
+        if (length != 1) {
+            throw new IllegalArgumentException("Invalid number of " + name +
+                    " nodes = " + length);
+        }
+        Element e = (Element) children.item(0);
+        if (!e.getNodeName().equals(name)) {
+            throw new IllegalArgumentException("Not a  " + name +
+                    " node \"" + e.getNodeName() + "\"");
+        }
+        return e;
+    }
+
+    // Constructs one ServiceTag instance from a service tag element root
+    private static ServiceTag getServiceTag(Element svcTagElement) {
+        return new ServiceTag(
+            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),
+            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),
+            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),
+            getTextValue(svcTagElement, ST_NODE_CONTAINER),
+            getTextValue(svcTagElement, ST_NODE_SOURCE),   
+            Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),
+            Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))
+        );
+    }
+
+    private static String getTextValue(Element e, String tagName) {
+        String value = "";
+        NodeList nl = e.getElementsByTagName(tagName);
+        if (nl != null && nl.getLength() > 0) {
+            Element el = (Element) nl.item(0);
+            Node node = el.getFirstChild();
+            if (node != null) {
+                value = node.getNodeValue();
+            }
+        }
+        return value;
+    }
+}
diff --git a/desktop/source/registration/com/sun/star/servicetag/Registry.java b/desktop/source/registration/com/sun/star/servicetag/Registry.java
index 51c90b9e94..ca093af81d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Registry.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Registry.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
index cfaa04baca..734f903b65 100644
--- a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
index 1ce6790094..48b037e3b5 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
index 01420fba8a..a6948d9b13 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/SunConnection.java b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
index 5bc3396e1b..558cf9b0b4 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
index 2508565b51..ed86175085 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
index d218650ee5..973350732a 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
index fd1e26643a..e26304fc1b 100644
--- a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
+++ b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/Util.java b/desktop/source/registration/com/sun/star/servicetag/Util.java
index 1981a2ff6f..4250182484 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Util.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Util.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
index 8f6b79dafa..ed7e14607f 100644
--- a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
@@ -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: Registration.java,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/desktop/source/registration/com/sun/star/servicetag/makefile.mk b/desktop/source/registration/com/sun/star/servicetag/makefile.mk
index d4ebbed2f0..ba1c616674 100644
--- a/desktop/source/registration/com/sun/star/servicetag/makefile.mk
+++ b/desktop/source/registration/com/sun/star/servicetag/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
index bb48ba9084..6681a563a0 100644
--- a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
+++ b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
@@ -1,366 +1,366 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

-

-<xs:element name="registration_data">

-  <xs:complexType>

-    <xs:sequence>

-      <xs:element name="environment"

-                  minOccurs="1"

-                  maxOccurs="1">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element ref="hostname"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="hostId"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="osName"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="osVersion"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="osArchitecture"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="systemModel"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="systemManufacturer"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="cpuManufacturer"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="serialNumber"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="physmem"

-                        minOccurs='0'

-                        maxOccurs='1'/>

-            <xs:element name="cpuinfo"

-                        minOccurs='0'

-                        maxOccurs='1'>

-              <xs:complexType>

-                <xs:sequence>

-                  <xs:element ref="sockets"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="cores"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="virtcpus"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="name"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="clockrate"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                </xs:sequence>

-              </xs:complexType>

-            </xs:element>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="registry"

-                  minOccurs="1"

-                  maxOccurs="1">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element name="service_tag"

-                        minOccurs="0"

-                        maxOccurs="1024">

-              <xs:complexType>

-                <xs:sequence>

-                  <xs:element ref="instance_urn"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_name"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_version"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_urn"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_parent_urn"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_parent"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_defined_inst_id"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_vendor"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="platform_arch"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="timestamp"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="container"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="source"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="installer_uid"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                </xs:sequence>

-              </xs:complexType>

-            </xs:element>

-          </xs:sequence>

-          <xs:attribute name="urn"

-                        type="xs:string"

-                        use="required"/>

-          <xs:attribute name="version"

-                        type="xs:string"

-                        use="required"/>

-        </xs:complexType>

-      </xs:element>

-    </xs:sequence>

-    <xs:attribute name="version"

-                  type="xs:string"

-                  use="required"/>

-  </xs:complexType>

-</xs:element>

-

-  <!-- definition of simple elements -->

-  <xs:element name="hostname">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="1"/>

-        <xs:maxLength value="255"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="hostId">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="16"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="osName">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="1"/>

-        <xs:maxLength value="256"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="osVersion">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="50"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="osArchitecture">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="256"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="systemModel">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="50"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="systemManufacturer">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="50"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="cpuManufacturer">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="50"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="serialNumber">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="256"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="instance_urn">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="1"/>

-        <xs:maxLength value="255"/>

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="product_name">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:maxLength value="255"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_version">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:maxLength value="63"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_urn">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="1"/>

-        <xs:maxLength value="255"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_parent_urn">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="255"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_parent">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="255"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_defined_inst_id">

-      <xs:simpleType>

-          <xs:restriction base="xs:string">

-              <xs:minLength value="0"/>

-              <xs:maxLength value="255"/>

-          </xs:restriction>

-      </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_vendor">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="63"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="platform_arch">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:minLength value="0"/>

-        <xs:maxLength value="63"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="timestamp">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:maxLength value="24"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="container">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:maxLength value="63"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element> 

-

-  <xs:element name="source">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:maxLength value="63"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element> 

-

-  <xs:element name="installer_uid">

-    <xs:simpleType>

-      <xs:restriction base="xs:integer">

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="physmem">

-    <xs:simpleType>

-      <xs:restriction base="xs:integer"/>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="sockets">

-    <xs:simpleType>

-      <xs:restriction base="xs:integer"/>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="cores">

-    <xs:simpleType>

-      <xs:restriction base="xs:integer"/>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="virtcpus">

-    <xs:simpleType>

-      <xs:restriction base="xs:integer"/>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="name">

-    <xs:simpleType>

-      <xs:restriction base="xs:string">

-        <xs:maxLength value="128"/>

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="clockrate">

-    <xs:simpleType>

-      <xs:restriction base="xs:integer"/>

-    </xs:simpleType>

-  </xs:element>

-

-</xs:schema>

+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+<xs:element name="registration_data">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element name="environment"
+                  minOccurs="1"
+                  maxOccurs="1">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element ref="hostname"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="hostId"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="osName"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="osVersion"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="osArchitecture"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="systemModel"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="systemManufacturer"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="cpuManufacturer"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="serialNumber"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="physmem"
+                        minOccurs='0'
+                        maxOccurs='1'/>
+            <xs:element name="cpuinfo"
+                        minOccurs='0'
+                        maxOccurs='1'>
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element ref="sockets"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="cores"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="virtcpus"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="name"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="clockrate"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="registry"
+                  minOccurs="1"
+                  maxOccurs="1">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="service_tag"
+                        minOccurs="0"
+                        maxOccurs="1024">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element ref="instance_urn"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_name"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_version"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_urn"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_parent_urn"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_parent"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_defined_inst_id"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_vendor"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="platform_arch"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="timestamp"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="container"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="source"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="installer_uid"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+          <xs:attribute name="urn"
+                        type="xs:string"
+                        use="required"/>
+          <xs:attribute name="version"
+                        type="xs:string"
+                        use="required"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="version"
+                  type="xs:string"
+                  use="required"/>
+  </xs:complexType>
+</xs:element>
+
+  <!-- definition of simple elements -->
+  <xs:element name="hostname">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="hostId">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="16"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="osName">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="256"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="osVersion">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="osArchitecture">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="256"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="systemModel">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="systemManufacturer">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="cpuManufacturer">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="serialNumber">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="256"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="instance_urn">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="product_name">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_version">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_urn">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_parent_urn">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_parent">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_defined_inst_id">
+      <xs:simpleType>
+          <xs:restriction base="xs:string">
+              <xs:minLength value="0"/>
+              <xs:maxLength value="255"/>
+          </xs:restriction>
+      </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_vendor">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="platform_arch">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="timestamp">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="24"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="container">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element> 
+
+  <xs:element name="source">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element> 
+
+  <xs:element name="installer_uid">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer">
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="physmem">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="sockets">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="cores">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="virtcpus">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="name">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="128"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="clockrate">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+</xs:schema>
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index 3ecb2af318..d84988fcec 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: evaluation.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/so_comp/evaluation.hxx b/desktop/source/so_comp/evaluation.hxx
index 2e64c4192a..928cc932b1 100644
--- a/desktop/source/so_comp/evaluation.hxx
+++ b/desktop/source/so_comp/evaluation.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: evaluation.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
index 4886c3701e..703ccc7a06 100644
--- a/desktop/source/so_comp/makefile.mk
+++ b/desktop/source/so_comp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index f5f54bc144..89c300557d 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oemjob.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/so_comp/oemjob.hxx b/desktop/source/so_comp/oemjob.hxx
index 921a25a32c..d3f31435fe 100644
--- a/desktop/source/so_comp/oemjob.hxx
+++ b/desktop/source/so_comp/oemjob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oemjob.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
index b8ffb10c26..2c0f6b3315 100644
--- a/desktop/source/so_comp/services.cxx
+++ b/desktop/source/so_comp/services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: services.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/splash/firststart.cxx b/desktop/source/splash/firststart.cxx
index 5b9447627f..21a0a56226 100755..100644
--- a/desktop/source/splash/firststart.cxx
+++ b/desktop/source/splash/firststart.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: firststart.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/splash/firststart.hxx b/desktop/source/splash/firststart.hxx
index 5ae0bfdcda..164c2c390d 100755..100644
--- a/desktop/source/splash/firststart.hxx
+++ b/desktop/source/splash/firststart.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: firststart.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index 3ca31875c9..e4b5877b5d 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/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.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index d10546d480..3d9cc5f653 100755..100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: services_spl.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index be36d3b14d..9c69307665 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splash.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 680a91382c..99677aa107 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splash.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/test/deployment/dependencies/readme.txt b/desktop/test/deployment/dependencies/readme.txt
index 751ab31eac..a99fade002 100644
--- a/desktop/test/deployment/dependencies/readme.txt
+++ b/desktop/test/deployment/dependencies/readme.txt
@@ -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: readme.txt,v $
-#
-# $Revision: 1.7.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/test/deployment/executable_content/build/hello.c b/desktop/test/deployment/executable_content/build/hello.c
index 5b749b6d92..b06598d699 100644
--- a/desktop/test/deployment/executable_content/build/hello.c
+++ b/desktop/test/deployment/executable_content/build/hello.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hello.c,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/test/deployment/executable_content/build/makefile.mk b/desktop/test/deployment/executable_content/build/makefile.mk
index 434a4359cc..5f5b527f0d 100644
--- a/desktop/test/deployment/executable_content/build/makefile.mk
+++ b/desktop/test/deployment/executable_content/build/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/test/deployment/identifier/readme.txt b/desktop/test/deployment/identifier/readme.txt
index 91baf01739..8a791c586a 100644
--- a/desktop/test/deployment/identifier/readme.txt
+++ b/desktop/test/deployment/identifier/readme.txt
@@ -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: readme.txt,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/desktop/test/deployment/locationtest/LocationTest.idl b/desktop/test/deployment/locationtest/LocationTest.idl
index 4c9a797f16..00c058801a 100644
--- a/desktop/test/deployment/locationtest/LocationTest.idl
+++ b/desktop/test/deployment/locationtest/LocationTest.idl
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: LocationTest.idl,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 
 #ifndef _com_sun_star_comp_smoketest_LocationTest_idl_ 
diff --git a/desktop/test/deployment/locationtest/LocationTest.java b/desktop/test/deployment/locationtest/LocationTest.java
index a0383c19d7..bcbbd6743a 100644
--- a/desktop/test/deployment/locationtest/LocationTest.java
+++ b/desktop/test/deployment/locationtest/LocationTest.java
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: LocationTest.java,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 package com.sun.star.comp.smoketest;
 
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk
index c8f9f4c652..d331473ba6 100644
--- a/desktop/test/deployment/locationtest/makefile.mk
+++ b/desktop/test/deployment/locationtest/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 4d921f9cb8..3e2e9ef7d8 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -1,14 +1,10 @@
 *************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OptionsEventHandler.java,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 package com.sun.star.comp.extensionoptions;
 
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
index d6a000274e..2b2bb2fd7c 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/test/deployment/update/dependencies/readme.txt b/desktop/test/deployment/update/dependencies/readme.txt
index b56d4cc7f1..3c71da2488 100644
--- a/desktop/test/deployment/update/dependencies/readme.txt
+++ b/desktop/test/deployment/update/dependencies/readme.txt
@@ -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: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml b/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
index a401749352..8d81fb3e58 100644
--- a/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
+++ b/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
- *
+
   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: update-dependencies.update.xml,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 <description xmlns="http://openoffice.org/extensions/update/2006"
     xmlns:d="http://openoffice.org/extensions/description/2006"
diff --git a/desktop/test/deployment/update/readme.txt b/desktop/test/deployment/update/readme.txt
index cdda759f12..b3fd9126ca 100644
--- a/desktop/test/deployment/update/readme.txt
+++ b/desktop/test/deployment/update/readme.txt
@@ -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: readme.txt,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/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl
index 1679c36d36..bfec050dab 100755..100644
--- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl
+++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: TestExtension.idl,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 
 #ifndef _com_sun_star_comp_smoketest_TestExtension_idl_ 
diff --git a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
index 591eb8674e..e16d7b7f03 100755..100644
--- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
+++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: TestExtension.java,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 package com.sun.star.comp.smoketest;
 
diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
index bf6bd4836c..af24122689 100755..100644
--- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
+++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/test/deployment/version/readme.txt b/desktop/test/deployment/version/readme.txt
index 7d452fcc36..c2ba28afd9 100644
--- a/desktop/test/deployment/version/readme.txt
+++ b/desktop/test/deployment/version/readme.txt
@@ -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: readme.txt,v $
- *
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/unx/source/officeloader/makefile.mk b/desktop/unx/source/officeloader/makefile.mk
index 46e5911c56..54a572af8b 100644
--- a/desktop/unx/source/officeloader/makefile.mk
+++ b/desktop/unx/source/officeloader/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx
index f075d8df8d..f33cdbd8d6 100755..100644
--- a/desktop/unx/source/officeloader/officeloader.cxx
+++ b/desktop/unx/source/officeloader/officeloader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: officeloader.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src
index 1f5939b309..7756147a03 100644
--- a/desktop/util/hidother.src
+++ b/desktop/util/hidother.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 78305523c4..157ffe7e58 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.83 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index eb791d1e3c..4603278ba4 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index 3b32368904..4101cb3630 100644
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 5fcc8cc758..dda8c8d046 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index 881a18fd67..cfde1d8e77 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: launcher.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index 278c8e23e9..1764f6a281 100644
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
index ad4c7c96b7..6e704a9bc4 100644
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ b/desktop/win32/source/applauncher/ooo/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc
index b96dc400c5..b909499000 100644
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/ooo/verinfo.rc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/applauncher/sbase.cxx b/desktop/win32/source/applauncher/sbase.cxx
index bded779c1c..8f50963ca3 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sbase.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/scalc.cxx b/desktop/win32/source/applauncher/scalc.cxx
index 833ed6f531..5795cb91d4 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scalc.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/sdraw.cxx b/desktop/win32/source/applauncher/sdraw.cxx
index 779c4c552c..63061aa499 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdraw.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/simpress.cxx b/desktop/win32/source/applauncher/simpress.cxx
index 9ae3d1f8a5..c3ff3f6972 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpress.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/smath.cxx b/desktop/win32/source/applauncher/smath.cxx
index 5db48b03d1..c5574cdb26 100644
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smath.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/sweb.cxx b/desktop/win32/source/applauncher/sweb.cxx
index 8543e83dfb..a8728f0a1f 100644
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sweb.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/swriter.cxx b/desktop/win32/source/applauncher/swriter.cxx
index bb4b64d98c..21919e0f3b 100644
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swriter.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
index f1e1bbcefe..090954e2db 100644
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ b/desktop/win32/source/applauncher/verinfo.rc
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/extendloaderenvironment.cxx b/desktop/win32/source/extendloaderenvironment.cxx
index 291d5518dd..0092f04549 100644
--- a/desktop/win32/source/extendloaderenvironment.cxx
+++ b/desktop/win32/source/extendloaderenvironment.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extendloaderenvironment.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/extendloaderenvironment.hxx b/desktop/win32/source/extendloaderenvironment.hxx
index 8fd8742181..ba90a1b7bd 100644
--- a/desktop/win32/source/extendloaderenvironment.hxx
+++ b/desktop/win32/source/extendloaderenvironment.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extendloaderenvironment.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index 6d3002dd23..ec0c00fa92 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: genericloader.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
index ff2a3ac1b0..ebe56d4c8d 100644
--- a/desktop/win32/source/guiloader/makefile.mk
+++ b/desktop/win32/source/guiloader/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/guistdio/guistdio.cxx b/desktop/win32/source/guistdio/guistdio.cxx
index 1d373d5f29..4a0518a757 100644
--- a/desktop/win32/source/guistdio/guistdio.cxx
+++ b/desktop/win32/source/guistdio/guistdio.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: guistdio.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 024b456efa..6acfcd08d0 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: guistdio.inc,v $
- * $Revision: 1.3.86.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/guistdio/makefile.mk b/desktop/win32/source/guistdio/makefile.mk
index 24772fb1ea..696a79d951 100644
--- a/desktop/win32/source/guistdio/makefile.mk
+++ b/desktop/win32/source/guistdio/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/guistdio/unopkgio.cxx b/desktop/win32/source/guistdio/unopkgio.cxx
index e9dfafa6ea..59701d08e1 100644
--- a/desktop/win32/source/guistdio/unopkgio.cxx
+++ b/desktop/win32/source/guistdio/unopkgio.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopkgio.cxx,v $
- * $Revision: 1.3.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/lwrapa.cxx b/desktop/win32/source/lwrapa.cxx
index bde54bc61b..0d1931aafb 100644
--- a/desktop/win32/source/lwrapa.cxx
+++ b/desktop/win32/source/lwrapa.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lwrapa.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/lwrapw.cxx b/desktop/win32/source/lwrapw.cxx
index 285eb649e9..734ae4497a 100644
--- a/desktop/win32/source/lwrapw.cxx
+++ b/desktop/win32/source/lwrapw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lwrapw.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
index ccb165398c..c104412886 100644
--- a/desktop/win32/source/makefile.mk
+++ b/desktop/win32/source/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
index 8700867f8a..8e8db7a1b9 100644
--- a/desktop/win32/source/officeloader/makefile.mk
+++ b/desktop/win32/source/officeloader/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 36ab5ad49b..9f4893ae86 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: officeloader.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/rebase/Resource.h b/desktop/win32/source/rebase/Resource.h
index 03ec1d4eee..b90d9b7c5e 100644
--- a/desktop/win32/source/rebase/Resource.h
+++ b/desktop/win32/source/rebase/Resource.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Resource.h,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/rebase/makefile.mk b/desktop/win32/source/rebase/makefile.mk
index dbab5a5d09..45af781cc1 100644
--- a/desktop/win32/source/rebase/makefile.mk
+++ b/desktop/win32/source/rebase/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/rebase/rebase.cxx b/desktop/win32/source/rebase/rebase.cxx
index 633e74723c..5688c63ef6 100644
--- a/desktop/win32/source/rebase/rebase.cxx
+++ b/desktop/win32/source/rebase/rebase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: md5.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,164 +24,164 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-

-#include "precompiled_desktop.hxx"

-#define UNICODE

-#define _UNICODE

-

-#define WIN32_LEAN_AND_MEAN

-#if defined _MSC_VER

-#pragma warning(push, 1)

-#endif

-#include <windows.h>

-#include <shellapi.h>

-#include <imagehlp.h>

-#include <wchar.h>

-#if defined _MSC_VER

-#pragma warning(pop)

-#endif

-

-#include <time.h>

-#include "sal/config.h"

-#include "tools/pathutils.hxx"

-

-#define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1)

-#define MY_STRING(s) (s), MY_LENGTH(s)

-

-const int   FORMAT_MESSAGE_SIZE = 4096;

-const DWORD PE_Signature        = 0x00004550;

-const DWORD BASEVIRTUALADDRESS	= 0x10000000;

-

-namespace

-{

-

-bool IsValidHandle( HANDLE handle )

-{

-    return ((NULL != handle) && (INVALID_HANDLE_VALUE != handle));

-}

-

-void fail() 

-{

-    LPWSTR buf = NULL;

-    FormatMessageW(

-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,

-        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);

-    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);

-    LocalFree(buf);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-bool rebaseImage( wchar_t* pszFilePath, ULONG nNewImageBase)

-{

-    ULONG ulOldImageSize;

-    ULONG_PTR lpOldImageBase;

-    ULONG ulNewImageSize;

-    ULONG_PTR lpNewImageBase  = nNewImageBase;

-    ULONG	  ulDateTimeStamp = 0;

-    bool      bResult(false);

-    

-    char cszFilePath[_MAX_PATH+1] = {0};

-    int nResult = WideCharToMultiByte(CP_ACP, 0, pszFilePath, -1, cszFilePath, _MAX_PATH, NULL, NULL);

-    

-    if (nResult != 0)

-    {

-        BOOL bResult = ReBaseImage(

-            cszFilePath,

-            "",

-            TRUE,

-            FALSE,

-            FALSE,

-            0,

-            &ulOldImageSize,

-            &lpOldImageBase,

-            &ulNewImageSize,

-            &lpNewImageBase,

-            ulDateTimeStamp );

-    }

-

-    return bResult;

-}

-

-wchar_t* getBrandPath(wchar_t * path)

-{

-    DWORD n = GetModuleFileNameW(NULL, path, MAX_PATH);

-    if (n == 0 || n >= MAX_PATH) {

-        exit(EXIT_FAILURE);

-    }

-    return tools::filename(path);

-}

-

-void rebaseImagesInFolder( wchar_t* pszFolder, DWORD nNewImageBase )

-{

-    wchar_t szPattern[MAX_PATH];

-    wchar_t	*lpLastSlash = wcsrchr( pszFolder, '\\' );

-    if ( lpLastSlash )

-    {

-        size_t len = lpLastSlash - pszFolder + 1;

-        wcsncpy( szPattern, pszFolder, len );

-        wcsncpy( szPattern + len, TEXT("*.dll"), sizeof(szPattern)/sizeof(szPattern[0]) - len );

-    }

-

-    WIN32_FIND_DATA	aFindFileData;

-    HANDLE	hFind = FindFirstFile( szPattern, &aFindFileData );

-

-    if ( IsValidHandle(hFind) )

-    {

-        BOOL fSuccess = false;

-

-        do

-        {

-            wchar_t szLibFilePath[MAX_PATH];

-            wchar_t	*lpLastSlash = wcsrchr( pszFolder, '\\' );

-            if ( lpLastSlash )

-            {

-                size_t len = lpLastSlash - pszFolder + 1;

-                wcsncpy( szLibFilePath, pszFolder, len );

-                wcsncpy( szLibFilePath + len, aFindFileData.cFileName, sizeof(szLibFilePath)/sizeof(szLibFilePath[0]) - len );

-            }

-

-            rebaseImage( szLibFilePath, nNewImageBase );

-            fSuccess = FindNextFile( hFind, &aFindFileData );

-        }

-        while ( fSuccess );

-

-        FindClose( hFind );

-    }

-}

-

-}

-

-extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )

-{

-    wchar_t path[MAX_PATH];

-    

-    wchar_t * pathEnd = getBrandPath(path);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"")) == NULL)

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if ( pathEnd == NULL )

-        return 0;

-

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\")) == NULL)

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if ( pathEnd == NULL )

-        return 0;

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\")) == NULL)

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-

-    return 0;

-}

+
+#include "precompiled_desktop.hxx"
+#define UNICODE
+#define _UNICODE
+
+#define WIN32_LEAN_AND_MEAN
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#include <shellapi.h>
+#include <imagehlp.h>
+#include <wchar.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include <time.h>
+#include "sal/config.h"
+#include "tools/pathutils.hxx"
+
+#define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1)
+#define MY_STRING(s) (s), MY_LENGTH(s)
+
+const int   FORMAT_MESSAGE_SIZE = 4096;
+const DWORD PE_Signature        = 0x00004550;
+const DWORD BASEVIRTUALADDRESS	= 0x10000000;
+
+namespace
+{
+
+bool IsValidHandle( HANDLE handle )
+{
+    return ((NULL != handle) && (INVALID_HANDLE_VALUE != handle));
+}
+
+void fail() 
+{
+    LPWSTR buf = NULL;
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
+        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);
+    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);
+    LocalFree(buf);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+bool rebaseImage( wchar_t* pszFilePath, ULONG nNewImageBase)
+{
+    ULONG ulOldImageSize;
+    ULONG_PTR lpOldImageBase;
+    ULONG ulNewImageSize;
+    ULONG_PTR lpNewImageBase  = nNewImageBase;
+    ULONG	  ulDateTimeStamp = 0;
+    bool      bResult(false);
+    
+    char cszFilePath[_MAX_PATH+1] = {0};
+    int nResult = WideCharToMultiByte(CP_ACP, 0, pszFilePath, -1, cszFilePath, _MAX_PATH, NULL, NULL);
+    
+    if (nResult != 0)
+    {
+        BOOL bResult = ReBaseImage(
+            cszFilePath,
+            "",
+            TRUE,
+            FALSE,
+            FALSE,
+            0,
+            &ulOldImageSize,
+            &lpOldImageBase,
+            &ulNewImageSize,
+            &lpNewImageBase,
+            ulDateTimeStamp );
+    }
+
+    return bResult;
+}
+
+wchar_t* getBrandPath(wchar_t * path)
+{
+    DWORD n = GetModuleFileNameW(NULL, path, MAX_PATH);
+    if (n == 0 || n >= MAX_PATH) {
+        exit(EXIT_FAILURE);
+    }
+    return tools::filename(path);
+}
+
+void rebaseImagesInFolder( wchar_t* pszFolder, DWORD nNewImageBase )
+{
+    wchar_t szPattern[MAX_PATH];
+    wchar_t	*lpLastSlash = wcsrchr( pszFolder, '\\' );
+    if ( lpLastSlash )
+    {
+        size_t len = lpLastSlash - pszFolder + 1;
+        wcsncpy( szPattern, pszFolder, len );
+        wcsncpy( szPattern + len, TEXT("*.dll"), sizeof(szPattern)/sizeof(szPattern[0]) - len );
+    }
+
+    WIN32_FIND_DATA	aFindFileData;
+    HANDLE	hFind = FindFirstFile( szPattern, &aFindFileData );
+
+    if ( IsValidHandle(hFind) )
+    {
+        BOOL fSuccess = false;
+
+        do
+        {
+            wchar_t szLibFilePath[MAX_PATH];
+            wchar_t	*lpLastSlash = wcsrchr( pszFolder, '\\' );
+            if ( lpLastSlash )
+            {
+                size_t len = lpLastSlash - pszFolder + 1;
+                wcsncpy( szLibFilePath, pszFolder, len );
+                wcsncpy( szLibFilePath + len, aFindFileData.cFileName, sizeof(szLibFilePath)/sizeof(szLibFilePath[0]) - len );
+            }
+
+            rebaseImage( szLibFilePath, nNewImageBase );
+            fSuccess = FindNextFile( hFind, &aFindFileData );
+        }
+        while ( fSuccess );
+
+        FindClose( hFind );
+    }
+}
+
+}
+
+extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
+{
+    wchar_t path[MAX_PATH];
+    
+    wchar_t * pathEnd = getBrandPath(path);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"")) == NULL)
+        fail();
+    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+    
+    if ( pathEnd == NULL )
+        return 0;
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\")) == NULL)
+        fail();
+    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+    
+    if ( pathEnd == NULL )
+        return 0;
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\")) == NULL)
+        fail();
+    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);
+
+    return 0;
+}
diff --git a/desktop/win32/source/rebase/rebasegui.cxx b/desktop/win32/source/rebase/rebasegui.cxx
index 3cb36cb49b..99dff9f213 100644
--- a/desktop/win32/source/rebase/rebasegui.cxx
+++ b/desktop/win32/source/rebase/rebasegui.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: md5.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,174 +24,174 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-

-#include "precompiled_desktop.hxx"

-

-#define  UNICODE    1

-#define _UNICODE    1

-

-#ifndef _WINDOWS_

-#	define WIN32_LEAN_AND_MEAN

-#if defined _MSC_VER

-#pragma warning(push, 1)

-#endif

-#	include <windows.h>

-#	include <shellapi.h>

-#	include <wchar.h>

-#if defined _MSC_VER

-#pragma warning(pop)

-#endif

-#endif

-

-#include "Resource.h"

-#include <time.h>

-#include "sal/config.h"

-#include "tools/pathutils.hxx"

-

-const DWORD PE_Signature = 0x00004550;

-

-#define MY_LENGTH(s)		(sizeof (s) / sizeof *(s) - 1)

-#define MY_STRING(s)		(s), MY_LENGTH(s)

-#define MAX_STR_CAPTION		256

-#define MAX_TEXT_LENGTH     1024

-

-static void failPath(wchar_t* pszAppTitle, wchar_t* pszMsg)

-{

-    MessageBoxW(NULL, pszMsg, pszAppTitle, MB_OK | MB_ICONERROR);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-static void fail() 

-{

-    LPWSTR buf = NULL;

-    FormatMessageW(

-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,

-        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);

-    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);

-    LocalFree(buf);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath )

-{

-    HANDLE                hFile;

-    HANDLE                hFileMapping;

-    LPVOID				  lpFileBase = 0;

-    PIMAGE_DOS_HEADER     lpDosHeader;

-    PIMAGE_NT_HEADERS     lpNTHeader;

-

-    hFile = CreateFile(pszFilePath, 

-                       GENERIC_READ, FILE_SHARE_READ, NULL,

-                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

-                       0);

-                    

-    if ( hFile == INVALID_HANDLE_VALUE )

-    {   

-        return NULL;

-    }

-    

-    hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);

-    if ( hFileMapping == 0 )

-    {   

-        CloseHandle(hFile);

-        return NULL;

-    }

-    

-    lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);

-    if ( lpFileBase == 0 )

-    {

-        CloseHandle(hFileMapping);

-        CloseHandle(hFile);

-        return NULL;

-    }

-

-    lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase;

-    if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE )

-    { 

-        lpNTHeader = (PIMAGE_NT_HEADERS)((char*)lpDosHeader + lpDosHeader->e_lfanew);

-        if (lpNTHeader->Signature == PE_Signature )

-            lpFileBase = reinterpret_cast<LPVOID>( lpNTHeader->OptionalHeader.ImageBase );

-    }

-    

-    UnmapViewOfFile(lpFileBase);

-    CloseHandle(hFileMapping);

-    CloseHandle(hFile);

-    

-    return lpFileBase;

-}

-

-static bool checkImageVirtualBaseAddress(wchar_t* pszFilePath, LPVOID lpVBA)

-{

-    LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath);

-    if ( lpImageVBA == lpVBA )

-        return true;

-    else

-        return false;

-}

-

-static wchar_t* getBrandPath(wchar_t * pszPath)

-{

-    DWORD n = GetModuleFileNameW(NULL, pszPath, MAX_PATH);

-    if (n == 0 || n >= MAX_PATH) {

-        exit(EXIT_FAILURE);

-    }

-    return tools::filename(pszPath);

-}

-

-extern "C" int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )

-{

-    wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ];

-             pAppTitle[0]  = '\0';

-    LoadString( hInst, IDS_APP_TITLE, pAppTitle, MAX_STR_CAPTION );

-

-    wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextServer[0]  = '\0';

-    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_SERVER, pTextServer, MAX_TEXT_LENGTH );

-

-    wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextClient[0]  = '\0';

-    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_CLIENT, pTextClient, MAX_TEXT_LENGTH );

-

-    wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextNoInstallation[0]  = '\0';

-    LoadString( hInst, IDS_MSG_NO_INSTALLATION_FOUND, pTextNoInstallation, MAX_TEXT_LENGTH );

-    

-    LPVOID  VBA = (void*)0x10000000;

-    wchar_t path[MAX_PATH];

-    

-    wchar_t * pathEnd = getBrandPath(path);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"libxml2.dll")) == NULL)

-        fail();

-    bool bFast = checkImageVirtualBaseAddress(path, VBA);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-

-    if (pathEnd == NULL)

-        failPath(pAppTitle, pTextNoInstallation);

-

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\vclmi.dll")) == NULL)

-        fail();

-    bFast &= checkImageVirtualBaseAddress(path, VBA);

-

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if (pathEnd == NULL)

-        failPath(pAppTitle, pTextNoInstallation);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\sal3.dll")) == NULL)

-        fail();

-    bFast &= checkImageVirtualBaseAddress(path, VBA);

-

-    const wchar_t* pOutput = pTextClient;

-    if (!bFast)

-        pOutput = pTextServer;

-        

-    MessageBoxW( NULL, pOutput, pAppTitle, MB_OK );

-    

-    return 0;

-}

+
+#include "precompiled_desktop.hxx"
+
+#define  UNICODE    1
+#define _UNICODE    1
+
+#ifndef _WINDOWS_
+#	define WIN32_LEAN_AND_MEAN
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#	include <windows.h>
+#	include <shellapi.h>
+#	include <wchar.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#endif
+
+#include "Resource.h"
+#include <time.h>
+#include "sal/config.h"
+#include "tools/pathutils.hxx"
+
+const DWORD PE_Signature = 0x00004550;
+
+#define MY_LENGTH(s)		(sizeof (s) / sizeof *(s) - 1)
+#define MY_STRING(s)		(s), MY_LENGTH(s)
+#define MAX_STR_CAPTION		256
+#define MAX_TEXT_LENGTH     1024
+
+static void failPath(wchar_t* pszAppTitle, wchar_t* pszMsg)
+{
+    MessageBoxW(NULL, pszMsg, pszAppTitle, MB_OK | MB_ICONERROR);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+static void fail() 
+{
+    LPWSTR buf = NULL;
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
+        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);
+    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);
+    LocalFree(buf);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath )
+{
+    HANDLE                hFile;
+    HANDLE                hFileMapping;
+    LPVOID				  lpFileBase = 0;
+    PIMAGE_DOS_HEADER     lpDosHeader;
+    PIMAGE_NT_HEADERS     lpNTHeader;
+
+    hFile = CreateFile(pszFilePath, 
+                       GENERIC_READ, FILE_SHARE_READ, NULL,
+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
+                       0);
+                    
+    if ( hFile == INVALID_HANDLE_VALUE )
+    {   
+        return NULL;
+    }
+    
+    hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    if ( hFileMapping == 0 )
+    {   
+        CloseHandle(hFile);
+        return NULL;
+    }
+    
+    lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);
+    if ( lpFileBase == 0 )
+    {
+        CloseHandle(hFileMapping);
+        CloseHandle(hFile);
+        return NULL;
+    }
+
+    lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase;
+    if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE )
+    { 
+        lpNTHeader = (PIMAGE_NT_HEADERS)((char*)lpDosHeader + lpDosHeader->e_lfanew);
+        if (lpNTHeader->Signature == PE_Signature )
+            lpFileBase = reinterpret_cast<LPVOID>( lpNTHeader->OptionalHeader.ImageBase );
+    }
+    
+    UnmapViewOfFile(lpFileBase);
+    CloseHandle(hFileMapping);
+    CloseHandle(hFile);
+    
+    return lpFileBase;
+}
+
+static bool checkImageVirtualBaseAddress(wchar_t* pszFilePath, LPVOID lpVBA)
+{
+    LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath);
+    if ( lpImageVBA == lpVBA )
+        return true;
+    else
+        return false;
+}
+
+static wchar_t* getBrandPath(wchar_t * pszPath)
+{
+    DWORD n = GetModuleFileNameW(NULL, pszPath, MAX_PATH);
+    if (n == 0 || n >= MAX_PATH) {
+        exit(EXIT_FAILURE);
+    }
+    return tools::filename(pszPath);
+}
+
+extern "C" int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )
+{
+    wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ];
+             pAppTitle[0]  = '\0';
+    LoadString( hInst, IDS_APP_TITLE, pAppTitle, MAX_STR_CAPTION );
+
+    wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextServer[0]  = '\0';
+    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_SERVER, pTextServer, MAX_TEXT_LENGTH );
+
+    wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextClient[0]  = '\0';
+    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_CLIENT, pTextClient, MAX_TEXT_LENGTH );
+
+    wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextNoInstallation[0]  = '\0';
+    LoadString( hInst, IDS_MSG_NO_INSTALLATION_FOUND, pTextNoInstallation, MAX_TEXT_LENGTH );
+    
+    LPVOID  VBA = (void*)0x10000000;
+    wchar_t path[MAX_PATH];
+    
+    wchar_t * pathEnd = getBrandPath(path);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"libxml2.dll")) == NULL)
+        fail();
+    bool bFast = checkImageVirtualBaseAddress(path, VBA);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+
+    if (pathEnd == NULL)
+        failPath(pAppTitle, pTextNoInstallation);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\vclmi.dll")) == NULL)
+        fail();
+    bFast &= checkImageVirtualBaseAddress(path, VBA);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+    
+    if (pathEnd == NULL)
+        failPath(pAppTitle, pTextNoInstallation);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\sal3.dll")) == NULL)
+        fail();
+    bFast &= checkImageVirtualBaseAddress(path, VBA);
+
+    const wchar_t* pOutput = pTextClient;
+    if (!bFast)
+        pOutput = pTextServer;
+        
+    MessageBoxW( NULL, pOutput, pAppTitle, MB_OK );
+    
+    return 0;
+}
diff --git a/desktop/win32/source/rwrapa.cxx b/desktop/win32/source/rwrapa.cxx
index 57a1e0dd9d..de57b2b3f2 100644
--- a/desktop/win32/source/rwrapa.cxx
+++ b/desktop/win32/source/rwrapa.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rwrapa.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/rwrapw.cxx b/desktop/win32/source/rwrapw.cxx
index 87719f8ef8..712d2f954e 100644
--- a/desktop/win32/source/rwrapw.cxx
+++ b/desktop/win32/source/rwrapw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rwrapw.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/setup/Resource.h b/desktop/win32/source/setup/Resource.h
index c2f9288754..760ed5f0d1 100644
--- a/desktop/win32/source/setup/Resource.h
+++ b/desktop/win32/source/setup/Resource.h
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index d26c9c9538..5ba07cd54f 100644
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index af50d912ef..a8830e25bd 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setup.cpp,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/setup/setup.hxx b/desktop/win32/source/setup/setup.hxx
index 1393fbd326..6d723e9c39 100644
--- a/desktop/win32/source/setup/setup.hxx
+++ b/desktop/win32/source/setup/setup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setup.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/setup/setup_a.cxx b/desktop/win32/source/setup/setup_a.cxx
index 629c4be1bc..2264e96dd9 100644
--- a/desktop/win32/source/setup/setup_a.cxx
+++ b/desktop/win32/source/setup/setup_a.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setup_a.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/setup/setup_help.hxx b/desktop/win32/source/setup/setup_help.hxx
index 9abb23df30..2a638ead08 100644
--- a/desktop/win32/source/setup/setup_help.hxx
+++ b/desktop/win32/source/setup/setup_help.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setup_help.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index 28fc251ea7..f6a920b1ef 100644
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index 5366dcf825..82fc0fd739 100644
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setup_main.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/setup/setup_w.cxx b/desktop/win32/source/setup/setup_w.cxx
index 6767c701aa..a21dbd685f 100644
--- a/desktop/win32/source/setup/setup_w.cxx
+++ b/desktop/win32/source/setup/setup_w.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: setup_w.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/sowrapper.cxx b/desktop/win32/source/sowrapper.cxx
index ef5f8d7875..4b0292be41 100644
--- a/desktop/win32/source/sowrapper.cxx
+++ b/desktop/win32/source/sowrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sowrapper.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index d4458212c3..c2a98802cc 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.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: unoinfo.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/desktop/win32/source/wrappera.cxx b/desktop/win32/source/wrappera.cxx
index 3aff61ece7..e121ce1217 100644
--- a/desktop/win32/source/wrappera.cxx
+++ b/desktop/win32/source/wrappera.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrappera.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/win32/source/wrapperw.cxx b/desktop/win32/source/wrapperw.cxx
index 9cb26c0670..700f79f603 100644
--- a/desktop/win32/source/wrapperw.cxx
+++ b/desktop/win32/source/wrapperw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrapperw.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 2845ac5979..729abfef2b 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
index 92d9d21ce1..da6bee38d8 100644
--- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
+++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: animationtiming.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx
index c5c884c312..099ae87944 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index 93e1f1d9cb..1153a68fc4 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillbitmapattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
index 1b98f7c18c..3eb2e4ba69 100644
--- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: lineattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
index 6cf75bdd76..d9b607c9ca 100644
--- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: linestartendattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
index 0d226dbd88..a314c90985 100644
--- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: materialattribute3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
index d56d16438b..d25d60cfda 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrallattribute3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2007-07-06 13:38:51 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
index dbbd116775..3d15024fad 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx
index d4693aa778..2f52ef76aa 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrattribute3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
index b6214cda46..2beff99a59 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrfillbitmapattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
index aa7facd6c7..70f48b586e 100644
--- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: strokeattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
index 46cee65b8a..e9d47bc68c 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: viewinformation2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
index df26bee592..a4309bc881 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: viewinformation3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
index af82017f0d..a7ba4fb69a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: alphaprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
index b7e36f822e..1a8e83d5aa 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: animatedprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 05986f6cdf..c20eb6b844 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: backgroundcolorprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
index fa2501d0e3..2037eb4a9d 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index 42c85fd025..36d3da0427 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: bitmapprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index ddab5bb53b..d3d75535fa 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: borderlineprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
index 2c91d8d6ab..db5af75cf7 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: chartprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
index 63c4a2ac01..7061ad5303 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: controlprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 25f100121a..89e530505c 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: drawinglayer_primitivetypes2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-04-04 06:00:22 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
index 8177e60305..1d77f7d723 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: embedded3dprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
index eafacf1c62..27639aa659 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillbitmapprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index 70ce489721..6cde71945a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillgradientprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index 770d981ba8..8a457a6973 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillhatchprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
index ec18e98106..d5441840cf 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: graphicprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
index e6a20f9640..96b5940beb 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: gridprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
index 9aa3f518bd..0475a88b94 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: groupprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
index d7805c7e44..9a7f506e56 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: helplineprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
index f72ee164cf..c984c17e9b 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: hittestprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
index ae7a316e03..27333266cd 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: unifiedalphaprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
index 1bd3fff055..f6b952856b 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: markerarrayprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
index 76c01793be..def340cda6 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: maskprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 0c124b3f34..2c4e3baaa3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: mediaprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
index 6dcfa2a409..a625319443 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: metafileprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index 4af19d3ad8..5a8825a801 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: modifiedcolorprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index 6d17a2a17d..8bb75ed345 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: pagepreviewprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index f04db4db5f..12e6737ef9 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: pointarrayprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 8c567b4806..ffe44fbbd7 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polygonprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index c3e621b4ff..c028cc1acf 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polypolygonprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
index 0a9c8ecc0d..1448eed33b 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
index 1383cc418f..f582fb661e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sceneprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 17520cc7b9..3580866823 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: shadowprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index 5e1bb573a0..71c3236edb 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: structuretagprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 6585e62178..f1a8b67e62 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textdecoratedprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index f435cc9bb3..eb5f809f93 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texteffectprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 685d3af57e..b4fd21c61f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texthierarchyprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
index 8d93175e61..5c04009fc0 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textlayoutdevice.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
index 412477c4c2..764ff05dec 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
index f877f88800..f2772cd446 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: transformprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
index 1f512f21cf..d0a95c8166 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: unifiedalphaprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
index a1504ac489..cc8632d0f2 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: wrongspellprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
index f32536785c..bbdee2e43d 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
index ec367665af..54e10fc4c7 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: drawinglayer_primitivetypes3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
index 16d85e652f..3d83d47038 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: groupprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
index aff2628c2f..7e4fe99729 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: hatchtextureprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx
index 3b0b17dc5d..8184f4e799 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: hittestprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
index d3f5c6ff28..94d9306dfb 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: modifiedcolorprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
index 8be3ffbfc9..520d29c3fa 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polygonprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
index ed006a8cc0..ea3324e897 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polygontubeprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
index 8d908f2512..268b83c574 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polypolygonprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
index b3cc9c850f..ee729f4c0d 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrcubeprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
index 22bc7db0bf..dde6179875 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrdecompositiontools3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index a810e585a5..22e02b1a30 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrextrudelathetools3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index 6773d1b7f6..36a09bf429 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrextrudeprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index fd6cf65b56..8fc5b56768 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrlatheprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
index f7470aecfc..95352fcfc1 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrpolypolygonprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
index 18d932d2c5..56c3f4b261 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
index 9d8ec96f21..411db2bdc5 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrsphereprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
index b9ddfe74f7..36e1973f78 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: shadowprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
index f620afe165..f834eb002e 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textureprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
index 2a9b7ea75d..dc0a3ed979 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: transformprimitive3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
index d3961905d1..8f8f7bf75c 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprocessor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
index 55760b13a7..dff072ad7b 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: canvasprocessor.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
index 7dc5181344..173828cc37 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: contourextractor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
index 46dd1765da..1ba205dc9d 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: contourextractor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
index c3ed548333..b18951607c 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: linegeometryextractor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:44:27 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index fda1f90cdd..09b59bb533 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: linegeometryextractor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:44:27 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
index f337cde7f0..c8098c0d40 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclmetafileprocessor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
index 2cc0f50047..8f84d6e994 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclpixelprocessor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
index 75d2fe39a3..d9cb1707e3 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclprocessor2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
index ad8048fa7e..bc8aea6d40 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprocessor3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
index de99d94f48..13d45f3134 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: zbufferprocessor3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
index a91238435d..16b79d4511 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: defaultprocessor3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
index 63f0753546..205fb48417 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: geometry2dextractor.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
index 9eb5521624..3a6c82978f 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: shadow3dextractor.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 0f57556549..908af0f661 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: zbufferprocessor3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx
index 26cc190494..f621749ce7 100644
--- a/drawinglayer/inc/drawinglayer/texture/texture.hxx
+++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texture.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
index 2f63d5ec38..80b9b42365 100644
--- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
+++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texture3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/makefile.mk b/drawinglayer/inc/makefile.mk
index cb24680562..4a79e029e5 100644
--- a/drawinglayer/inc/makefile.mk
+++ b/drawinglayer/inc/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-03-05 09:17:49 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 PRJ=..
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
index da379db178..c340f36adc 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: precompiled_drawinglayer.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-03-05 09:18:44 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index ae5cbe01f4..45f8743459 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: precompiled_drawinglayer.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-03-05 09:18:45 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index afa2b311b8..46db0851ba 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: animationtiming.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/animation/makefile.mk b/drawinglayer/source/animation/makefile.mk
index a72bf10711..4f23756e80 100644
--- a/drawinglayer/source/animation/makefile.mk
+++ b/drawinglayer/source/animation/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2006-12-13 16:57:07 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/attribute/fillattribute.cxx b/drawinglayer/source/attribute/fillattribute.cxx
index bba413c0b3..c2d4fde849 100644
--- a/drawinglayer/source/attribute/fillattribute.cxx
+++ b/drawinglayer/source/attribute/fillattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx b/drawinglayer/source/attribute/fillbitmapattribute.cxx
index 0d6ea7f66c..6c07363d41 100644
--- a/drawinglayer/source/attribute/fillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillbitmapattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx
index 5ab44b73db..e249d7fe49 100644
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: lineattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx
index eafcc7e3f4..d4f48420e3 100644
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: linestartendattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/makefile.mk b/drawinglayer/source/attribute/makefile.mk
index fa91224e64..4a72f2617a 100644
--- a/drawinglayer/source/attribute/makefile.mk
+++ b/drawinglayer/source/attribute/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2007-11-07 14:27:26 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index b030017780..b0cadb247e 100644
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: materialattribute3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 4bc4b642f9..6a3c3cbe5e 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrallattribute3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrattribute.cxx b/drawinglayer/source/attribute/sdrattribute.cxx
index 4955ceddc9..8811f36171 100644
--- a/drawinglayer/source/attribute/sdrattribute.cxx
+++ b/drawinglayer/source/attribute/sdrattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrattribute3d.cxx b/drawinglayer/source/attribute/sdrattribute3d.cxx
index fef84cf2eb..9b69110ce2 100644
--- a/drawinglayer/source/attribute/sdrattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrattribute3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrattribute3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
index eaf7a01742..5bedbf058e 100644
--- a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrfillbitmapattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index 89fc5d8622..6fef16f130 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: strokeattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/geometry/makefile.mk b/drawinglayer/source/geometry/makefile.mk
index 38ceeb55a8..013e0151af 100644
--- a/drawinglayer/source/geometry/makefile.mk
+++ b/drawinglayer/source/geometry/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-06-10 09:29:32 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index d7029fc067..f6be9a1ad9 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: viewinformation2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:07 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index 8925fb3bb6..079607a009 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: viewinformation3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:07 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/alphaprimitive2d.cxx b/drawinglayer/source/primitive2d/alphaprimitive2d.cxx
index 0f4fecc8b0..0d70cff899 100644
--- a/drawinglayer/source/primitive2d/alphaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/alphaprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: alphaprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index f935f5b5b3..ec3f95953e 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: animatedprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
index 084fc8fc66..d0ed34123c 100644
--- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: backgroundcolorprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index f385812d61..34993bd081 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index 8b3ba03e3b..0caa5961ff 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: bitmapprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index a2fda82d8f..ed308dbb51 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: borderlineprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/chartprimitive2d.cxx b/drawinglayer/source/primitive2d/chartprimitive2d.cxx
index 68ca32f41e..fa94a70953 100644
--- a/drawinglayer/source/primitive2d/chartprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/chartprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: chartprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 5fc261a79e..a3de9965d0 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: controlprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index 54c71a1196..fe232e3629 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: embedded3dprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
index d7d004df02..1e95e305cd 100644
--- a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillbitmapprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 61760758c1..e2a8d345b2 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillgradientprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 6749b4bf18..7c5c3f4a60 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: fillhatchprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index e5de786032..dc49b2177c 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: graphicprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 14a3398697..5f65630563 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: gridprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index 276103d851..00ab094ecf 100644
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: groupprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 2889ceadb2..4a1a4fbe5e 100644
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: helplineprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/hittestprimitive2d.cxx b/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
index 58f7242254..4d2c5efd29 100644
--- a/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: hittestprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
index e3292beeb7..0c24894b15 100644
--- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: unifiedalphaprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/makefile.mk b/drawinglayer/source/primitive2d/makefile.mk
index e10d1ddbcc..2bf09cbfc2 100644
--- a/drawinglayer/source/primitive2d/makefile.mk
+++ b/drawinglayer/source/primitive2d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-04-04 06:00:23 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index a324aac8f9..5b704d6ea6 100644
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: markerarrayprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index 223538c5a4..f6867a0a2e 100644
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: maskprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 198bc04c64..457ea535de 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: mediaprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 34ed96e19d..224645146c 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: metafileprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index 5c2a44131f..ecb1b74914 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: modifiedcolorprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index a6e292eeec..fcc33d0e3b 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: pagepreviewprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
index 4ab437b60e..d9aabb787c 100644
--- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: pointarrayprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index ad9a23504f..4218406e2c 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polygonprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 81bc519136..130c3cf6c0 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polypolygonprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index d288a697d7..5451969e8c 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index acf3307bbf..709402ff16 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sceneprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index 8ee3841782..f2ecf6f56f 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: shadowprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index 973b376400..206db42742 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: structuretagprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 94059228b1..63b7f34668 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textdecoratedprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
index 6c5952e6aa..333bb1ec9b 100644
--- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texteffectprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index ff5caffb91..3f284b0953 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texthierarchyprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 6fe64bdd71..aec5005e06 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textlayoutdevice.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index 92f3e3bfa3..720b8220cc 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
index d9b88309a7..a50ccfec26 100644
--- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: transformprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx
index 9005067b8a..b552c22b1c 100644
--- a/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: unifiedalphaprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
index 5ac16fe972..c4bd68d276 100644
--- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: wrongspellprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index bdb1046c6f..666bb30733 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index c23ec72002..11c83d26ea 100644
--- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: groupprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 1bb44f9888..dcc83a1631 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: hatchtextureprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/hittestprimitive3d.cxx b/drawinglayer/source/primitive3d/hittestprimitive3d.cxx
index b74d9d01c2..87a17126d9 100644
--- a/drawinglayer/source/primitive3d/hittestprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hittestprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: hittestprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/makefile.mk b/drawinglayer/source/primitive3d/makefile.mk
index fb160fb9bf..83e34d5bd7 100644
--- a/drawinglayer/source/primitive3d/makefile.mk
+++ b/drawinglayer/source/primitive3d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index 2f41dcb9bb..aebbfb1a63 100644
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: modifiedcolorprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index bde0ae85ea..e9b8dbe1cd 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polygonprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index f4b238b644..fc489fa150 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polygontubeprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
index 586535b80d..325daf8b53 100644
--- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: polypolygonprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 25c53a8257..636eb41717 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrcubeprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index df15cc8a3c..6f3954545a 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrdecompositiontools3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 222925127a..12c15d0c26 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrextrudelathetools3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index b3e21fc793..b708cde509 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrextrudeprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-26 16:21:48 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 16db524155..7c12bb0374 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrlatheprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 38d9ad54e1..3234a03459 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrpolypolygonprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index b57f49e59e..2e4358b54a 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index b03fe9801d..8f78e3b370 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sdrsphereprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
index 1c0811923a..afd84c960e 100644
--- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: shadowprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
index 4063ee299f..5b4f83a8e7 100644
--- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: textureprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
index 1c42aba15e..44e51cce83 100644
--- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: transformprimitive3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx
index 5d7e85b467..a4d1797df2 100644
--- a/drawinglayer/source/processor2d/baseprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprocessor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index 77cb2b3350..fcca4050a0 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: canvasprocessor.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx
index dc2cedad31..7d57162aa6 100644
--- a/drawinglayer/source/processor2d/contourextractor2d.cxx
+++ b/drawinglayer/source/processor2d/contourextractor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: contourextractor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx
index 383f678e28..63aa54d61d 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: helperchartrenderer.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:28:34 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.hxx b/drawinglayer/source/processor2d/helperchartrenderer.hxx
index e670cccdf2..2904422c50 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.hxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: helperchartrenderer.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:28:43 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
index 902ba55ea5..5f06cb8307 100644
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: helperwrongspellrenderer.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:28:52 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
index b6c2303fff..18b5711a68 100644
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: helperwrongspellrenderer.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:29:02 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 16d69646cb..e8f5e677fc 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: contourextractor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
index fc7740eacc..4fff40ea10 100644
--- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
+++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: linegeometryextractor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:44:27 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/makefile.mk b/drawinglayer/source/processor2d/makefile.mk
index fcbf2413b6..dc2e0571bb 100644
--- a/drawinglayer/source/processor2d/makefile.mk
+++ b/drawinglayer/source/processor2d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
index 2ca8f3ff38..0413401b3a 100644
--- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
+++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: contourextractor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
index 75ec7e3898..329274edc1 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelperbitmaprender.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
index caa8d54add..448bd6327f 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelperbitmaprender.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
index d5f3388de5..37e3899fc8 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelperbitmaptransform.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
index ff1fdb9dc8..c197b7bfcb 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelperbitmaptransform.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:22 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 39db373b1c..8a474a727e 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelperbufferdevice.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:22 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
index 4ffca76e4c..e4e31a5bf8 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelperbufferdevice.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:22 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx
index c02845e9c6..0a771e1aaf 100644
--- a/drawinglayer/source/processor2d/vclhelpergradient.cxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelpergradient.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:22 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.hxx b/drawinglayer/source/processor2d/vclhelpergradient.hxx
index 8f2558a7b5..9d275af60d 100644
--- a/drawinglayer/source/processor2d/vclhelpergradient.hxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclhelpergradient.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:22 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 82db20f2b3..a3ae0f2a67 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclmetafileprocessor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index de18983cad..90d54c3c7a 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclpixelprocessor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-26 16:21:48 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 05a73e1e5e..a7c9ed8864 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1,31 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: vclprocessor2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx
index 58ad95a5ba..be6ac99343 100644
--- a/drawinglayer/source/processor3d/baseprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: baseprocessor3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
index 5705ba74ca..063421a06a 100644
--- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: zbufferprocessor3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 33a2e1639f..fe05d635fe 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: defaultprocessor3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index 790ac05993..2eccf5bbf3 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: geometry2dextractor.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/makefile.mk b/drawinglayer/source/processor3d/makefile.mk
index 2ae2ae52f2..d482962017 100644
--- a/drawinglayer/source/processor3d/makefile.mk
+++ b/drawinglayer/source/processor3d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index daf3df495b..750af4f7aa 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: shadow3dextractor.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 3fd02a4a49..b561402ded 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: zbufferprocessor3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/texture/makefile.mk b/drawinglayer/source/texture/makefile.mk
index abbb303cea..028a206875 100644
--- a/drawinglayer/source/texture/makefile.mk
+++ b/drawinglayer/source/texture/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-04-16 04:59:59 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index 964099b691..76511a1f5c 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texture.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:34 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 062d7c67f0..9759b2af92 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: texture3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:34 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk
index 5356ee0cef..954f86e146 100644
--- a/drawinglayer/util/makefile.mk
+++ b/drawinglayer/util/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/embeddedobj/inc/makefile.mk b/embeddedobj/inc/makefile.mk
index 462087a0a3..05e69a852a 100644
--- a/embeddedobj/inc/makefile.mk
+++ b/embeddedobj/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
index 56211aa308..32141c1455 100644
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
+++ b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_embeddedobj.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
index baf3881b54..3807d04a10 100644
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
+++ b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_embeddedobj.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/qa/embedding/EmbeddingUnitTest.java b/embeddedobj/qa/embedding/EmbeddingUnitTest.java
index 3a17934099..5f1b3f81c8 100644
--- a/embeddedobj/qa/embedding/EmbeddingUnitTest.java
+++ b/embeddedobj/qa/embedding/EmbeddingUnitTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EmbeddingUnitTest.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/qa/embedding/makefile.mk b/embeddedobj/qa/embedding/makefile.mk
index 1d516e77e2..edc3c23ef1 100644
--- a/embeddedobj/qa/embedding/makefile.mk
+++ b/embeddedobj/qa/embedding/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5.14.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 799e8654e9..d98c5c4d2e 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: embedobj.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index f84ec214c4..6881571eae 100644
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: inplaceobj.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/makefile.mk b/embeddedobj/source/commonembedding/makefile.mk
index fb34576ac6..4365bdfa40 100644
--- a/embeddedobj/source/commonembedding/makefile.mk
+++ b/embeddedobj/source/commonembedding/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index c99f47722d..670f23d634 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: miscobj.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index bd2ffcf042..b952119256 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: persistence.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index f72de11a03..bd2a64b299 100644
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/register.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: register.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index c1622aa296..d68b5b1242 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: specialobject.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index ff85611330..5a68132155 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: visobj.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 4648ea1bf0..0edbaeb58f 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfactory.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index 0c5314877b..7675b7bf79 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfactory.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 69e8baed31..1256a33d12 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docholder.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index db048a4969..aebec4e84e 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dummyobject.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index fcbf2d130c..c16c4e6dd7 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: intercept.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/general/makefile.mk b/embeddedobj/source/general/makefile.mk
index f0dc5be199..0bb83003bf 100644
--- a/embeddedobj/source/general/makefile.mk
+++ b/embeddedobj/source/general/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 084921120c..74f49d0e9d 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xcreator.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 1da11b48c9..e94094314f 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: closepreventer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 9139409c09..59e709ac3e 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commonembobj.hxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index c018f1d18a..c8df82fb15 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docholder.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 7bdedf1408..417f2a9f5f 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dummyobject.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 58119deade..1fdee34ce3 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: intercept.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 16e27ab54c..c2dd0243ed 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oleembobj.hxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index 8b6e35a24a..f7d456b942 100644
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: specialobject.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/targetstatecontrol.hxx b/embeddedobj/source/inc/targetstatecontrol.hxx
index 3ce7436ebb..58db1e2c62 100644
--- a/embeddedobj/source/inc/targetstatecontrol.hxx
+++ b/embeddedobj/source/inc/targetstatecontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: targetstatecontrol.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index 28e9adce0e..5404cc1ae6 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xcreator.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx
index 1344b95f10..87025d2b08 100644
--- a/embeddedobj/source/msole/advisesink.cxx
+++ b/embeddedobj/source/msole/advisesink.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: advisesink.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx
index 5760de90da..4cdd5ac179 100644
--- a/embeddedobj/source/msole/advisesink.hxx
+++ b/embeddedobj/source/msole/advisesink.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: advisesink.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
index 427dd07444..eb754434c0 100644
--- a/embeddedobj/source/msole/closepreventer.cxx
+++ b/embeddedobj/source/msole/closepreventer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: closepreventer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index db79473e34..b5d81817e4 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphconvert.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index 2af3f28183..f5f8e18eb9 100644
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index 6cda477bf6..61eb4fc545 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mtnotification.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index d156d19bbe..021ad81c82 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olecomponent.cxx,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index f77dbd2330..d2121313be 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olecomponent.hxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 28a1aa9b02..ec6b5a275a 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oleembed.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index c57ad63730..650ffb36d5 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olemisc.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index a85356e191..e263a61d6c 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olepersist.cxx,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 096f6249f9..092ec7c8bb 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oleregister.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 27f6a59d7c..bb73953fd6 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olevisual.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olewrapclient.cxx b/embeddedobj/source/msole/olewrapclient.cxx
index 983e7c970f..6538c793c1 100644
--- a/embeddedobj/source/msole/olewrapclient.cxx
+++ b/embeddedobj/source/msole/olewrapclient.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olewrapclient.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index affcf3a6f1..14bf28780f 100644
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: olewrapclient.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 2be4a3f9d4..2fdf41e039 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ownview.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 9d65bb13b0..b7e6c817fe 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ownview.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index c731f24899..b64d9d5749 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: platform.h,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 56199216cc..17b331f8bf 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xdialogcreator.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index ef99e96405..6dd69ed38a 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xdialogcreator.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index d78c841f0a..083890ff8e 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xolefactory.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index 25c9ca5d91..0a7e6c43f6 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xolefactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/Container1/JavaWindowPeerFake.java b/embeddedobj/test/Container1/JavaWindowPeerFake.java
index 7f70867cd3..8764f0d865 100644
--- a/embeddedobj/test/Container1/JavaWindowPeerFake.java
+++ b/embeddedobj/test/Container1/JavaWindowPeerFake.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JavaWindowPeerFake.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java
index 6feb79025a..e88e2a0ad8 100644
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NativeView.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk
index d635ce250f..b310709448 100644
--- a/embeddedobj/test/Container1/makefile.mk
+++ b/embeddedobj/test/Container1/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9.14.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/test/Container1/nativelib/makefile.mk b/embeddedobj/test/Container1/nativelib/makefile.mk
index 0bd5be0420..f60af38668 100644
--- a/embeddedobj/test/Container1/nativelib/makefile.mk
+++ b/embeddedobj/test/Container1/nativelib/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index 7a5f5e3b47..bf872bedfb 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nativeview.c,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.h b/embeddedobj/test/Container1/nativelib/nativeview.h
index 9b867cd388..b0ad4d42bc 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.h
+++ b/embeddedobj/test/Container1/nativelib/nativeview.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nativeview.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/MainThreadExecutor/makefile.mk b/embeddedobj/test/MainThreadExecutor/makefile.mk
index c3f39a5556..33f9e1938e 100644
--- a/embeddedobj/test/MainThreadExecutor/makefile.mk
+++ b/embeddedobj/test/MainThreadExecutor/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index 1d951895c7..f27d9b8bc0 100644
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/register.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: register.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index 78dec2c3e9..134e92ab27 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xexecutor.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index b4bd6ba97d..23d9751084 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xexecutor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index ae5b2d4501..f5ccb7c69d 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bitmapcreator.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index 1f0d5d76d0..fe9f77eeb0 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bitmapcreator.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 1a3e7cd8bc..59f7973ccd 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mainthreadexecutor.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index 21f762de2f..63ab54cb73 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mainthreadexecutor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/test/mtexecutor/makefile.mk b/embeddedobj/test/mtexecutor/makefile.mk
index 28c308e70d..aa1231e362 100644
--- a/embeddedobj/test/mtexecutor/makefile.mk
+++ b/embeddedobj/test/mtexecutor/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index b28bfb1658..5011b12ab3 100644
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mteregister.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
index 91fe1c83fe..5824263b75 100644
--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index c55ca4a8c4..232d684b21 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventattacher.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk
index f642559b80..88ebee85e7 100644
--- a/eventattacher/source/makefile.mk
+++ b/eventattacher/source/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index fbbcc31e04..8f1f96d844 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FileAccess.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
index ff9eaab41f..96e41001c8 100644
--- a/fileaccess/source/makefile.mk
+++ b/fileaccess/source/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/inc/AddressConvention.hxx b/formula/inc/AddressConvention.hxx
index fdb6f18043..d140918601 100644
--- a/formula/inc/AddressConvention.hxx
+++ b/formula/inc/AddressConvention.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index 9044bd7b7a..3ea961faf0 100644
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.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: externalrefmgr.hxx,v $
- * $Revision: 1.1.2.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 4be65adb75..20b241c0a5 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
index 6808c6afd8..2ebe647065 100644
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
@@ -1,89 +1,86 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: tokenuno.hxx,v $

- * $Revision: 1.4 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-#ifndef FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED

-#define FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED

-

-#include "formula/formuladllapi.h"

-#include <cppuhelper/implbase2.hxx>

-#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>

-#include <com/sun/star/lang/XServiceInfo.hpp>

-#include <com/sun/star/uno/XComponentContext.hpp>

-#include <memory>

-#include "formula/FormulaCompiler.hxx"

-

-

-namespace formula

-{

-

-class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<

-                            ::com::sun::star::sheet::XFormulaOpCodeMapper,

-                            ::com::sun::star::lang::XServiceInfo >

-{

-    ::std::auto_ptr<FormulaCompiler> m_pCompiler;

-public:

-    static ::rtl::OUString	getImplementationName_Static();

-    static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static();

-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);

-

-protected:

-                            FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler);

-    virtual                 ~FormulaOpCodeMapperObj();

-

-private:

-                            // XFormulaOpCodeMapper

-                            // Attributes

-    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException);

-    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException);

-                            // Methods

-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings(

-                                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames,

-                                    sal_Int32 nLanguage )

-                                throw ( ::com::sun::star::lang::IllegalArgumentException,

-                                        ::com::sun::star::uno::RuntimeException);

-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings(

-                                    sal_Int32 nLanguage, sal_Int32 nGroups )

-                                throw ( ::com::sun::star::lang::IllegalArgumentException,

-                                        ::com::sun::star::uno::RuntimeException);

-

-                            // XServiceInfo

-    virtual ::rtl::OUString SAL_CALL getImplementationName()

-                                throw(::com::sun::star::uno::RuntimeException);

-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )

-                                throw(::com::sun::star::uno::RuntimeException);

-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()

-                                throw(::com::sun::star::uno::RuntimeException);

-

-};

-// =============================================================================

-} // formula

-// =============================================================================

-

-#endif // FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
+#define FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
+
+#include "formula/formuladllapi.h"
+#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
+#include "formula/FormulaCompiler.hxx"
+
+
+namespace formula
+{
+
+class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
+                            ::com::sun::star::sheet::XFormulaOpCodeMapper,
+                            ::com::sun::star::lang::XServiceInfo >
+{
+    ::std::auto_ptr<FormulaCompiler> m_pCompiler;
+public:
+    static ::rtl::OUString	getImplementationName_Static();
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static();
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
+
+protected:
+                            FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler);
+    virtual                 ~FormulaOpCodeMapperObj();
+
+private:
+                            // XFormulaOpCodeMapper
+                            // Attributes
+    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException);
+                            // Methods
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings(
+                                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames,
+                                    sal_Int32 nLanguage )
+                                throw ( ::com::sun::star::lang::IllegalArgumentException,
+                                        ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings(
+                                    sal_Int32 nLanguage, sal_Int32 nGroups )
+                                throw ( ::com::sun::star::lang::IllegalArgumentException,
+                                        ::com::sun::star::uno::RuntimeException);
+
+                            // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+                                throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+                                throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+                                throw(::com::sun::star::uno::RuntimeException);
+
+};
+// =============================================================================
+} // formula
+// =============================================================================
+
+#endif // FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/formula/inc/formula/IControlReferenceHandler.hxx
index 75ca7da10d..5b5a78b046 100644
--- a/formula/inc/formula/IControlReferenceHandler.hxx
+++ b/formula/inc/formula/IControlReferenceHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formula.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index 90f736bdc5..403049f8aa 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.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: funcpage.hxx,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/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 8c402c2819..e8243482a7 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: compiler.hrc,v $
- * $Revision: 1.20.134.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx
index c15697ac91..2d8d9d18b7 100644
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: errorcodes.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 5f9825356f..f26caac03e 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formdata.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 0b91f59f4c..be0de2d649 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formula.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/formuladllapi.h b/formula/inc/formula/formuladllapi.h
index 2320ae6cb8..7a397d7520 100644
--- a/formula/inc/formula/formuladllapi.h
+++ b/formula/inc/formula/formuladllapi.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dllapi.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx
index 9d18097271..54cf272776 100644
--- a/formula/inc/formula/formulahelper.hxx
+++ b/formula/inc/formula/formulahelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formula.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index e51e17b750..05c765af50 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: funcutl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/grammar.hxx b/formula/inc/formula/grammar.hxx
index 74520da4a0..5f8e6be823 100644
--- a/formula/inc/formula/grammar.hxx
+++ b/formula/inc/formula/grammar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grammar.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/intruref.hxx b/formula/inc/formula/intruref.hxx
index a0dc9ad5ee..c51cb6c90d 100644
--- a/formula/inc/formula/intruref.hxx
+++ b/formula/inc/formula/intruref.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: intruref.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 906d408b8b..1d58c952e3 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opcode.hxx,v $
- * $Revision: 1.23.134.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index aae43cc561..6d440d11e7 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: token.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 46192f9271..9956b4fa79 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tokenarray.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index 438d4da088..47a2336eaf 100644
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpids.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/makefile.mk b/formula/inc/makefile.mk
index 4d06d357ee..ed8085749d 100644
--- a/formula/inc/makefile.mk
+++ b/formula/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/inc/pch/precompiled_formula.cxx b/formula/inc/pch/precompiled_formula.cxx
index 77cdd62b24..e9079eebf2 100644
--- a/formula/inc/pch/precompiled_formula.cxx
+++ b/formula/inc/pch/precompiled_formula.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_reportdesign.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/inc/pch/precompiled_formula.hxx b/formula/inc/pch/precompiled_formula.hxx
index 8d33bbec97..6334ffecb2 100644
--- a/formula/inc/pch/precompiled_formula.hxx
+++ b/formula/inc/pch/precompiled_formula.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: precompiled_reportdesign.hxx,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/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 1a2720d7d4..69416d4a20 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index d71126816a..77186d0c20 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/api/makefile.mk b/formula/source/core/api/makefile.mk
index d4c132ac41..872f76f298 100644
--- a/formula/source/core/api/makefile.mk
+++ b/formula/source/core/api/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx
index 4a29c25d6b..b59ad25276 100644
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: services.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 74795e32fe..4f57d693f3 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: token.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
index a8cc75b67c..f4a5b1b8f3 100644
--- a/formula/source/core/inc/core_resource.hrc
+++ b/formula/source/core/inc/core_resource.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: core_resource.hrc,v $
- * $Revision: 1.16.68.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index 77b1a4de50..dc421f604d 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: core_resource.hxx,v $
- * $Revision: 1.5.68.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index 088c5958f2..7e9ce4232c 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: core_resource.cxx,v $
- * $Revision: 1.11.68.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index c653087da4..d2996e78fb 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: compiler.src,v $
- * $Revision: 1.59 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/core/resource/makefile.mk b/formula/source/core/resource/makefile.mk
index 13744ad59b..c6b6ac0d1f 100644
--- a/formula/source/core/resource/makefile.mk
+++ b/formula/source/core/resource/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 92f7faadac..0518d51dc7 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: funcutl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index f5ba200853..365e04b2c1 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formula.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 75d4906e90..0c70dda516 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formdlgs.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 7828b0a6ef..c57950abfd 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formdlgs.src,v $
- * $Revision: 1.49 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 897f53b59b..897640cedf 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.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: formula.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 5256450a28..77e387ad89 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: funcpage.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 801fda4389..3a3eb5be34 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: funcpage.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 4d12751105..b21a57742f 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: funcutl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/makefile.mk b/formula/source/ui/dlg/makefile.mk
index 04d19bb79a..a55f6ba325 100644
--- a/formula/source/ui/dlg/makefile.mk
+++ b/formula/source/ui/dlg/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index a0c26562a5..b6800c3e5e 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parawin.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc
index 388da0657b..1b840b8736 100644
--- a/formula/source/ui/dlg/parawin.hrc
+++ b/formula/source/ui/dlg/parawin.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parawin.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 3a68cd94b9..d0ae884d70 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parawin.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index d74ef6a1b7..b75137cd54 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: parawin.src,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 1afb1c0fb4..ba9b6a9eb8 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: structpg.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 5990df37a4..32d2de2d0b 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: structpg.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index a708b90364..9e92201f9a 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RptResId.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 2c06a804eb..a00585a352 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ModuleHelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index e6ea0353ce..cce482378c 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ModuleHelper.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/source/ui/resource/makefile.mk b/formula/source/ui/resource/makefile.mk
index d9a6039ae7..60eec89dc3 100644
--- a/formula/source/ui/resource/makefile.mk
+++ b/formula/source/ui/resource/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/util/hidother.src b/formula/util/hidother.src
index 942d5c2e36..8cf49660e9 100644
--- a/formula/util/hidother.src
+++ b/formula/util/hidother.src
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index d1d78c11bb..d8b4ccfe13 100644
--- a/formula/util/makefile.mk
+++ b/formula/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.21 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/formula/util/makefile.pmk b/formula/util/makefile.pmk
index 9b0f73ace8..a34cb4cb8e 100644
--- a/formula/util/makefile.pmk
+++ b/formula/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/inc/makefile.mk b/fpicker/inc/makefile.mk
index a820da9949..4c515346d6 100644
--- a/fpicker/inc/makefile.mk
+++ b/fpicker/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/inc/pch/precompiled_fpicker.cxx b/fpicker/inc/pch/precompiled_fpicker.cxx
index 2e4d1a1bdf..4ac04c6bdd 100644
--- a/fpicker/inc/pch/precompiled_fpicker.cxx
+++ b/fpicker/inc/pch/precompiled_fpicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_fpicker.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/inc/pch/precompiled_fpicker.hxx b/fpicker/inc/pch/precompiled_fpicker.hxx
index 633410b94e..e98065b915 100644
--- a/fpicker/inc/pch/precompiled_fpicker.hxx
+++ b/fpicker/inc/pch/precompiled_fpicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_fpicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 717b5d1297..9515cdb59a 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AquaFilePickerDelegate.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index d73e5d82ff..518c521ec3 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AquaFilePickerDelegate.mm,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/CFStringUtilities.cxx b/fpicker/source/aqua/CFStringUtilities.cxx
index eec4530f87..14b87b0d87 100644
--- a/fpicker/source/aqua/CFStringUtilities.cxx
+++ b/fpicker/source/aqua/CFStringUtilities.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CFStringUtilities.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 1f5bf37320..f742dde670 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CFStringUtilities.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index d289608631..84dc649236 100644
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlHelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index a3956e3040..4471bfc4b1 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlHelper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx
index c63f3a2274..66cff666db 100644
--- a/fpicker/source/aqua/FPServiceInfo.hxx
+++ b/fpicker/source/aqua/FPServiceInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPServiceInfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index 21fc269a59..127d1f5d60 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPentry.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index 5fc9369cc2..10e429f201 100644
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FilterHelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index c77f93f26b..0c4e756238 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FilterHelper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index bff6535174..09c6029de1 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NSString_OOoAdditions.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm
index cc22cbc9c7..f1af8290fd 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.mm
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NSString_OOoAdditions.mm,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
index e65bb3984f..8be2c03620 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NSURL_OOoAdditions.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index d9495a5c9a..8475d440e4 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NSURL_OOoAdditions.mm,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index 9017bf2122..83d74c63fc 100644
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaConstants.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index 9e99200325..31bfd1cf1e 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaFilePicker.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 46d8f73064..2b33c4105c 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaFilePicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index de72b44370..0ea595b016 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaFolderPicker.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index bf28a29efa..b7529a11e3 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaFolderPicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index c084c71a25..3806b94fc0 100644
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaPicker.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index 53775d7045..ba9712179a 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalAquaPicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
index e6a8247480..b32e770d91 100644
--- a/fpicker/source/aqua/makefile.mk
+++ b/fpicker/source/aqua/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 937e6fb962..51985208c7 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index 270bd436b4..66323e9a08 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 409e582742..393b843e5b 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fpicker.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
index 7f8f8c0bc4..9bf1e638d2 100644
--- a/fpicker/source/generic/makefile.mk
+++ b/fpicker/source/generic/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 990a991d83..6b817af2dc 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeControlAccess.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index b524f99a00..2a2dbfba9e 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeControlAccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 916b7bccf8..984b21c60a 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeFilePicker.cxx,v $
- * $Revision: 1.17.20.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 7244602edb..7b54e650d4 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeFilePicker.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index 908ce7e4af..8fbbc35a40 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeFilePicker.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 090aed73b0..e683793769 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeFolderPicker.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index a92736098c..e4a1e975bb 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeFolderPicker.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 467f7d99ac..a03342b49d 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asyncfilepicker.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 79f7cf2697..c9ad82961f 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asyncfilepicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 8fa1ac31f4..609df3c7b8 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commonpicker.cxx,v $
- * $Revision: 1.9.12.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 6dc6e41a75..442a5f3629 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commonpicker.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 19b4ad6e3d..3868fb0176 100644
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fpinteraction.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 6f614d7a3f..fd3fe8c460 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fpinteraction.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index d41fcc336c..52659e1f76 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fps_office.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 32a699895f..23ffc4a616 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fpsmartcontent.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index fc280c555b..fe58b4da43 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fpsmartcontent.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 00e714106e..5369fa6cf8 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iodlg.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index eaaed21f90..cdf97009f8 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iodlg.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c680e394d0..f171710249 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iodlg.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 91538d1490..0b3c27b680 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iodlg.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index f3b768ac53..14204023f3 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iodlgimp.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 8d9df32ee9..c2dce2c9d2 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iodlgimp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
index 1362458622..be137ebea1 100644
--- a/fpicker/source/office/makefile.mk
+++ b/fpicker/source/office/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx
index c5826998a0..ee28d9652d 100644
--- a/fpicker/source/office/pickercallbacks.hxx
+++ b/fpicker/source/office/pickercallbacks.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pickercallbacks.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/FPServiceInfo.hxx b/fpicker/source/unx/gnome/FPServiceInfo.hxx
index 2e18671555..8e74ce65e8 100644
--- a/fpicker/source/unx/gnome/FPServiceInfo.hxx
+++ b/fpicker/source/unx/gnome/FPServiceInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPServiceInfo.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index b4aef6e0c8..c158d5e741 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPentry.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 65cf6e79dc..5148b974c2 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalGtkFilePicker.cxx,v $
- * $Revision: 1.28.42.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index 0146b9cdb8..52f8692470 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalGtkFilePicker.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index a19f1cc29d..da2cff863b 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalGtkFolderPicker.cxx,v $
- * $Revision: 1.11.42.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
index 049374ef81..fc543c6160 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalGtkFolderPicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 3a9b3a3a5d..05627db27e 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalGtkPicker.cxx,v $
- * $Revision: 1.17.32.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx
index a520117c0e..8b3ab0e0f3 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SalGtkPicker.hxx,v $
- * $Revision: 1.10.42.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/eventnotification.hxx b/fpicker/source/unx/gnome/eventnotification.hxx
index 2b3d943fa9..6cb9c55851 100644
--- a/fpicker/source/unx/gnome/eventnotification.hxx
+++ b/fpicker/source/unx/gnome/eventnotification.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventnotification.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk
index 2c0f42cafc..fcf9d37425 100644
--- a/fpicker/source/unx/gnome/makefile.mk
+++ b/fpicker/source/unx/gnome/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index 9197082b24..1a1c6e9a59 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/gnome/resourceprovider.hxx b/fpicker/source/unx/gnome/resourceprovider.hxx
index b5e24c59ed..cb43dd12b3 100644
--- a/fpicker/source/unx/gnome/resourceprovider.hxx
+++ b/fpicker/source/unx/gnome/resourceprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/unx/kde4/FPServiceInfo.hxx b/fpicker/source/unx/kde4/FPServiceInfo.hxx
index 59804eaba8..bcd52f76f9 100644
--- a/fpicker/source/unx/kde4/FPServiceInfo.hxx
+++ b/fpicker/source/unx/kde4/FPServiceInfo.hxx
@@ -1,61 +1,27 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index f6c7b0e691..e3d3e81a72 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -1,61 +1,27 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 70742bc955..4c11f34e75 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -1,54 +1,27 @@
 /*************************************************************************
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  Sun Microsystems Inc., October, 2000
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ * This file is part of OpenOffice.org.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): Jan Holesovsky <kendy@openoffice.org>
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index 291e6f7c3a..ccf4be21c6 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
@@ -1,61 +1,27 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): Jan Holesovsky <kendy@openoffice.org>
- *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk
index 6f9db777bc..97c316151f 100644
--- a/fpicker/source/unx/kde4/makefile.mk
+++ b/fpicker/source/unx/kde4/makefile.mk
@@ -1,62 +1,27 @@
 #*************************************************************************
 #
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
+# OpenOffice.org - a multi-platform office productivity suite
 #
+# This file is part of OpenOffice.org.
 #
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#   The Contents of this file are made available subject to the terms of
-#   either of the following licenses
-#
-#          - GNU Lesser General Public License Version 2.1
-#          - Sun Industry Standards Source License Version 1.1
-#
-#   Sun Microsystems Inc., October, 2000
-#
-#   GNU Lesser General Public License Version 2.1
-#   =============================================
-#   Copyright 2000 by Sun Microsystems, Inc.
-#   901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License version 2.1, as published by the Free Software Foundation.
-#
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#   MA  02111-1307  USA
-#
-#
-#   Sun Industry Standards Source License Version 1.1
-#   =================================================
-#   The contents of this file are subject to the Sun Industry Standards
-#   Source License Version 1.1 (the "License"); You may not use this file
-#   except in compliance with the License. You may obtain a copy of the
-#   License at http://www.openoffice.org/license.html.
-#
-#   Software provided under this License is provided on an "AS IS" basis,
-#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-#   See the License for the specific provisions governing your rights and
-#   obligations concerning the Software.
-#
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-#
-#   Copyright: 2000 by Sun Microsystems, Inc.
-#
-#   All Rights Reserved.
-#
-#   Contributor(s): _______________________________________
-#
-#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
index 6b7f6ef534..c6894ca850 100644
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPServiceInfo.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 7d2d9d93fc..d35487d290 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FPentry.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index f28a18c56a..2149c51f65 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FileOpenDlg.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 618754b738..648449f792 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FileOpenDlg.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 2342c88aee..9e11cc7f37 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FilePicker.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 4d0a21aed2..792dfcbdc8 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FilePicker.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index dbdb632906..0fd873a218 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FilterContainer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 3224e45117..03c2c28570 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FilterContainer.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 37288ef726..6af0fe1642 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IVistaFilePickerInternalNotify.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 1954a8de42..ddf670c462 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PreviewCtrl.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index ebf2160c16..43f584a9b3 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PreviewCtrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx
index 3c446f412e..9f0ddbd824 100644
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.cxx
@@ -1,58 +1,55 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: asynceventnotifier.cxx,v $

- * $Revision: 1.16 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-// MARKER(update_precomp.py): autogen include statement, do not remove

-#include "precompiled_fpicker.hxx"

-

-#include <vcl/svapp.hxx>

-#include <vos/mutex.hxx>

-#include <osl/thread.hxx>

-

-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)

-{

-    int nAcquireCount = 0;

-    vos::IMutex& rSolarMutex = Application::GetSolarMutex();

-    vos::OThread::TThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();

-    

-    if ( nMainThreadId == nThreadId )

-    {

-        ::vos::IMutex& rMutex = Application::GetSolarMutex();

-        if ( rMutex.tryToAcquire() )

-            nAcquireCount = Application::ReleaseSolarMutex() - 1;

-    }

-    

-    return nAcquireCount;

-}

-

-void AcquireSolarMutex(int nAcquireCount)

-{

-    if ( nAcquireCount )

-        Application::AcquireSolarMutex( nAcquireCount );

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_fpicker.hxx"
+
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+#include <osl/thread.hxx>
+
+int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)
+{
+    int nAcquireCount = 0;
+    vos::IMutex& rSolarMutex = Application::GetSolarMutex();
+    vos::OThread::TThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();
+    
+    if ( nMainThreadId == nThreadId )
+    {
+        ::vos::IMutex& rMutex = Application::GetSolarMutex();
+        if ( rMutex.tryToAcquire() )
+            nAcquireCount = Application::ReleaseSolarMutex() - 1;
+    }
+    
+    return nAcquireCount;
+}
+
+void AcquireSolarMutex(int nAcquireCount)
+{
+    if ( nAcquireCount )
+        Application::AcquireSolarMutex( nAcquireCount );
+}
diff --git a/fpicker/source/win32/filepicker/SolarMutex.hxx b/fpicker/source/win32/filepicker/SolarMutex.hxx
index 95dcf13ecc..b5897d8ea1 100644
--- a/fpicker/source/win32/filepicker/SolarMutex.hxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.hxx
@@ -1,33 +1,30 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: asynceventnotifier.cxx,v $

- * $Revision: 1.16 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);

-

-void AcquireSolarMutex(int nAcquireCount);

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);
+
+void AcquireSolarMutex(int nAcquireCount);
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index a80604c18f..1a1a7fbf8d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VistaFilePicker.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 11ef555404..910995eeec 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VistaFilePicker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 6814f79761..3d347438f8 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VistaFilePickerEventHandler.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index ad1870d5ee..7b2e50a9c4 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VistaFilePickerEventHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 31784e44bd..67bd016bac 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VistaFilePickerImpl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index a5fb9e9330..f62171d324 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VistaFilePickerImpl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 2ee2867d95..478431ffff 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinFileOpenImpl.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 16c0c3b7ce..05f527b7e4 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinFileOpenImpl.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index ba847f15eb..c82b0a45e6 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asynceventnotifier.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index d08860a4a4..e44f927e2d 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asynceventnotifier.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index bc4515c13b..71becb1172 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asyncrequests.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 0a7e5c2c15..92d0708aba 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asyncrequests.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx
index 8c6d87e414..6f2eea64f4 100644
--- a/fpicker/source/win32/filepicker/comptr.hxx
+++ b/fpicker/source/win32/filepicker/comptr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: comptr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index 76cd8e655a..7f05d450d0 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlaccess.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index 26c70e2434..fb97cafee0 100644
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlaccess.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index d1d4f99842..d310ea7327 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlcommand.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index a280c61cc9..ca7c160193 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlcommand.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
index 4e0de409a0..a4dd342710 100644
--- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlcommandrequest.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 445d8eea22..b1eeb9d275 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlcommandresult.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx
index 1a5bc33c2f..964c817d09 100644
--- a/fpicker/source/win32/filepicker/customcontrol.cxx
+++ b/fpicker/source/win32/filepicker/customcontrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customcontrol.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx
index 54ecad8e61..8985cfb263 100644
--- a/fpicker/source/win32/filepicker/customcontrol.hxx
+++ b/fpicker/source/win32/filepicker/customcontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customcontrol.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
index 3d1d8ff91a..1230f9bf88 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customcontrolcontainer.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
index d7a5647c59..1aca81ceac 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customcontrolcontainer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index 8fbfc6c660..fad33fec75 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customcontrolfactory.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index 028684b0ab..340c9a4456 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customcontrolfactory.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
index 1482c5c42b..a4b3322a37 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialogcustomcontrols.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
index ad14e6a977..cd630befa1 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialogcustomcontrols.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index a3e19e8179..aedfa5dcb5 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dibpreview.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 8e018050ca..ec3202040f 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dibpreview.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index 2b3d943fa9..6cb9c55851 100644
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventnotification.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
index 05244444e6..e7fc54ef50 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filepickereventnotification.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
index ac74ceace0..df504b0f18 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filepickereventnotification.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index dc0858a63a..b8a996e637 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filepickerstate.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 2559871c3a..897a6a2b0d 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filepickerstate.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index a9b467316b..c4c59d1f5b 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: getfilenamewrapper.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 81419226ca..e951d14cb0 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: getfilenamewrapper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 1e1c2d6bfe..108539e850 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helppopupwindow.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index 1c6ef3c231..b96d21c40c 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helppopupwindow.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk
index de192879b6..a42c36b578 100644
--- a/fpicker/source/win32/filepicker/makefile.mk
+++ b/fpicker/source/win32/filepicker/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h
index fe4492d87e..e8812909f7 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: platform_vista.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h
index 4108b109ac..d9603ade08 100644
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: platform_xp.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index de09f1fae5..d22ac5980e 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: previewadapter.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 43eb6555d3..5785b2d85a 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: previewadapter.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index a74b699766..ee4ceab0fb 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: previewbase.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 692cd07621..55a2957492 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: previewbase.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/propmap.hxx b/fpicker/source/win32/filepicker/propmap.hxx
index ca877ccd75..949446d920 100644
--- a/fpicker/source/win32/filepicker/propmap.hxx
+++ b/fpicker/source/win32/filepicker/propmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propmap.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index fef500d58c..0a984e6f4f 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shared.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h
index e867ca4d73..d4c9975ccb 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: vistatypes.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index d8ae71baf6..a92a460a08 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Test_fps.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/filepicker/workbench/makefile.mk
index 8a9d104f82..60ec42e8c4 100644
--- a/fpicker/source/win32/filepicker/workbench/makefile.mk
+++ b/fpicker/source/win32/filepicker/workbench/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index db92045d8a..c0a09acecd 100644
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FOPServiceInfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 9d2e67199d..5389f33576 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FolderPicker.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 95a0a5a02f..022d6aa149 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FolderPicker.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index 774fc88fc2..9222b4cc47 100644
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FopEvtDisp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index d8a134ce44..7b7f29e809 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Fopentry.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index d63ca14d12..eb9cad179f 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MtaFop.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 1246d080ce..1dac21ff31 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MtaFop.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index d0171429ad..e6c6e3a6fb 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinFOPImpl.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 0b664880e3..e54b209600 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinFOPImpl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk
index 7a0ee692bd..cbadad59c2 100644
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ b/fpicker/source/win32/folderpicker/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index ee72930a52..dcee448d7d 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Test_fops.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk
index dda6c98e21..d379821443 100644
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index b1ca089687..b7081ad01f 100644
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoBuffer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/misc/AutoBuffer.hxx b/fpicker/source/win32/misc/AutoBuffer.hxx
index f4f2bd25a0..e79612215a 100644
--- a/fpicker/source/win32/misc/AutoBuffer.hxx
+++ b/fpicker/source/win32/misc/AutoBuffer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoBuffer.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 8d41da1fb1..a8dc2d86b9 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinImplHelper.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 494cbd61e3..fc583ef65e 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinImplHelper.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/misc/makefile.mk b/fpicker/source/win32/misc/makefile.mk
index 29ba591478..ecdaa990fe 100644
--- a/fpicker/source/win32/misc/makefile.mk
+++ b/fpicker/source/win32/misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 803339892a..270c510581 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index e1d2134f2a..97cd753053 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
index 3f8a1d6218..dc62d24d2f 100644
--- a/fpicker/test/makefile.mk
+++ b/fpicker/test/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 0d5342fcb0..235e4c4f1d 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdem.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index fbdb51e6e9..ec995ed45f 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/collector/cmduicollector.cxx b/framework/collector/cmduicollector.cxx
index 94cbf563c6..a7de1819be 100644
--- a/framework/collector/cmduicollector.cxx
+++ b/framework/collector/cmduicollector.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmduicollector.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/collector/makefile.mk b/framework/collector/makefile.mk
index 11b9620ad4..3137a4a068 100644
--- a/framework/collector/makefile.mk
+++ b/framework/collector/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/collector/uicmdstohtml.cxx b/framework/collector/uicmdstohtml.cxx
index 8b685b3e3d..55f0275ae0 100644
--- a/framework/collector/uicmdstohtml.cxx
+++ b/framework/collector/uicmdstohtml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uicmdstohtml.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd
index f49ef5f840..493231f9ab 100644
--- a/framework/dtd/accelerator.dtd
+++ b/framework/dtd/accelerator.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: accelerator.dtd,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean		"(true|false)">
diff --git a/framework/dtd/event.dtd b/framework/dtd/event.dtd
index be748a4472..dc6c4fe87c 100644
--- a/framework/dtd/event.dtd
+++ b/framework/dtd/event.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: event.dtd,v $
- 
-  $Revision: 1.5 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- xlink:type -->
diff --git a/framework/dtd/groupuinames.dtd b/framework/dtd/groupuinames.dtd
index 6378e4ef06..19d2d67f65 100644
--- a/framework/dtd/groupuinames.dtd
+++ b/framework/dtd/groupuinames.dtd
@@ -1,32 +1,28 @@
 <!--
 
   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: groupuinames.dtd,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <!ELEMENT groupuinames:template-group-list (groupuinames:template-group*)>
 <!ATTLIST groupuinames:template-group-list xmlns:groupuinames CDATA #FIXED "http://openoffice.org/2006/groupuinames"> 
diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd
index f2bf2f0744..fe528a5ea3 100644
--- a/framework/dtd/image.dtd
+++ b/framework/dtd/image.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: image.dtd,v $
- 
-  $Revision: 1.5 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % url "CDATA">
diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd
index 545d40f0cc..837fc8cf3b 100644
--- a/framework/dtd/menubar.dtd
+++ b/framework/dtd/menubar.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: menubar.dtd,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT menu:menubar (menu:menu+)>
diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd
index 10e767df86..1c8160d925 100644
--- a/framework/dtd/statusbar.dtd
+++ b/framework/dtd/statusbar.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: statusbar.dtd,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean		"(true|false)">
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd
index 31620dd0dd..67938db9df 100644
--- a/framework/dtd/toolbar.dtd
+++ b/framework/dtd/toolbar.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: toolbar.dtd,v $
- 
-  $Revision: 1.9 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <!ENTITY % boolean "(true|false)">
 <!ENTITY % numeric "CDATA">
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index d32a7752e7..9c1b97767e 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconst.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/arguments.h b/framework/inc/arguments.h
index 914043c39a..5b6d6fa0e1 100644
--- a/framework/inc/arguments.h
+++ b/framework/inc/arguments.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: arguments.h,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index a296a788db..c5f81b2300 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: actiontriggercontainer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 00641c241d..4b805b9fcf 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: actiontriggerpropertyset.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 01676a9035..c65ce9b41d 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: actiontriggerseparatorpropertyset.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 37e5e05933..2ebe26f3d7 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: addonmenu.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx
index ea3f05735c..abf0b8d0e4 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/classes/addonsoptions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: addonsoptions.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 4155140114..816aec0295 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bmkmenu.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 2b860350c7..de233ab29a 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: checkediterator.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 6a068ac4dd..8b56032de3 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: converter.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx
index 0b1ef72456..7e5f889f10 100644
--- a/framework/inc/classes/droptargetlistener.hxx
+++ b/framework/inc/classes/droptargetlistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: droptargetlistener.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 2d375f913e..e954b22773 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtercache.hxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index aa980009fc..2e683f31b3 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtercachedata.hxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 431fe2f31c..de67411beb 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framecontainer.hxx,v $
- * $Revision: 1.18.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx
index 34d825d994..0e2ee67246 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/classes/framelistanalyzer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framelistanalyzer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index b08829eb0d..bcc10c5a56 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fwkresid.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 84574282e8..3cf06f17e1 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.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: backingwindow.hxx,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/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index f81e093ed8..a0ef14d5d4 100755..100644
--- a/framework/inc/classes/fwlresid.hxx
+++ b/framework/inc/classes/fwlresid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FwlResId.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 2ac4f42b8f..eac6e11424 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagewrapper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/classes/menuextensionsupplier.hxx
index b1f3efefcc..04fe3352fa 100644
--- a/framework/inc/classes/menuextensionsupplier.hxx
+++ b/framework/inc/classes/menuextensionsupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menuextensionsupplier.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 50a7457f0f..a57de9f9e3 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menumanager.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 20b20c202a..458d407688 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysethelper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index d51f5ea3cc..2d6ae2eb36 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: protocolhandlercache.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 2284185872..8bb34ad7b3 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resource.hrc,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index ea27faa3d0..82d8292499 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rootactiontriggercontainer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx
index 2c9f9a551f..5a86cdb9d0 100644
--- a/framework/inc/classes/servicemanager.hxx
+++ b/framework/inc/classes/servicemanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: servicemanager.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx
index 75c1d9d365..ab20e9f0f2 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/classes/sfxhelperfunctions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxhelperfunctions.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 032d1094c9..8d299faced 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: taskcreator.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 51c7ccf015..b41c02fbdf 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wildcard.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/classes/xmlnamespaces.hxx b/framework/inc/classes/xmlnamespaces.hxx
index 1cfaeb164e..c476de8ae2 100644
--- a/framework/inc/classes/xmlnamespaces.hxx
+++ b/framework/inc/classes/xmlnamespaces.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnamespaces.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
index 3e7199083e..38c911b288 100644
--- a/framework/inc/commands.h
+++ b/framework/inc/commands.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commands.h,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index f74efb05ca..4c8a0eddee 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basedispatcher.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/blankdispatcher.hxx b/framework/inc/dispatch/blankdispatcher.hxx
index e0dc9e23ab..acb70e4ffd 100644
--- a/framework/inc/dispatch/blankdispatcher.hxx
+++ b/framework/inc/dispatch/blankdispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: blankdispatcher.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 9579d83cbb..d268558ddf 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: closedispatcher.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/createdispatcher.hxx b/framework/inc/dispatch/createdispatcher.hxx
index fbd7b05696..adbf530f56 100644
--- a/framework/inc/dispatch/createdispatcher.hxx
+++ b/framework/inc/dispatch/createdispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: createdispatcher.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 6790d09460..caffb301a2 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchinformationprovider.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 20f0d5becc..fa543ac6b1 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchprovider.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx
index 819294a6f3..f447a0bd01 100644
--- a/framework/inc/dispatch/helpagentdispatcher.hxx
+++ b/framework/inc/dispatch/helpagentdispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpagentdispatcher.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx
index 69e5854957..33b3c07dfb 100644
--- a/framework/inc/dispatch/interaction.hxx
+++ b/framework/inc/dispatch/interaction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interaction.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index a0c703bb90..0c5673d2f0 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interceptionhelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 77c9290b24..8e1ca8a10d 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailtodispatcher.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 485d436ffe..73aa7e3704 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menudispatcher.hxx,v $
- * $Revision: 1.7.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 2c3f98577e..992ddfa2c2 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oxt_handler.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 5b705e7b07..18b56a3cda 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: popupmenudispatcher.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/selfdispatcher.hxx b/framework/inc/dispatch/selfdispatcher.hxx
index 6310c08ee7..99ca060807 100644
--- a/framework/inc/dispatch/selfdispatcher.hxx
+++ b/framework/inc/dispatch/selfdispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selfdispatcher.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 4b08e0622b..5e1ffe2c91 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: servicehandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 4d084f9f2b..e3ae1244cd 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: closedispatcher.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -86,14 +83,14 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
                    uno resources. */
         css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
 
-        //---------------------------------------

-        /** @short  our "context" frame. */

-        css::uno::WeakReference< css::frame::XFrame > m_xOwner;

+        //---------------------------------------
+        /** @short  our "context" frame. */
+        css::uno::WeakReference< css::frame::XFrame > m_xOwner;
+    
+        //---------------------------------------
+        /** @short  the original queryDispatch() target. */
+        ::rtl::OUString m_sDispatchTarget;
     
-        //---------------------------------------

-        /** @short  the original queryDispatch() target. */

-        ::rtl::OUString m_sDispatchTarget;

-    

         //---------------------------------------
         /** @short  list of registered status listener */
         ListenerHash m_lStatusListener;
@@ -104,7 +101,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
     public:
 
         //---------------------------------------
-        /** @short  connect a new StartModuleDispatcher instance to its "owner frame".

+        /** @short  connect a new StartModuleDispatcher instance to its "owner frame".
     
             @descr  Such "owner frame" is used as context for all related operations.
 
@@ -159,11 +156,11 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
     // internal helper
 
     private:
-

-        //---------------------------------------

-        /** @short  check if StartModule can be shown.

+
+        //---------------------------------------
+        /** @short  check if StartModule can be shown.
          */
-        ::sal_Bool implts_isBackingModePossible();

+        ::sal_Bool implts_isBackingModePossible();
     
         //---------------------------------------
         /** @short  open the special BackingComponent (now StartModule)
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 557cad6f27..c7d3dd49af 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: systemexec.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index 714558edc8..4974dc21da 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: targets.h,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,11 +41,11 @@
 namespace framework{
 
 //_________________________________________________________________________________________________________________
-

-static ::rtl::OUString CMD_UNO_SHOWSTARTMODULE = ::rtl::OUString::createFromAscii(".uno:ShowStartModule");

+
+static ::rtl::OUString CMD_UNO_SHOWSTARTMODULE = ::rtl::OUString::createFromAscii(".uno:ShowStartModule");
 static ::rtl::OUString CMD_UNO_CLOSEDOC        = ::rtl::OUString::createFromAscii(".uno:CloseDoc"       );
 static ::rtl::OUString CMD_UNO_CLOSEWIN        = ::rtl::OUString::createFromAscii(".uno:CloseWin"       );
-static ::rtl::OUString CMD_UNO_CLOSEFRAME      = ::rtl::OUString::createFromAscii(".uno:CloseFrame"     );

+static ::rtl::OUString CMD_UNO_CLOSEFRAME      = ::rtl::OUString::createFromAscii(".uno:CloseFrame"     );
 
 }		//	namespace framework
 
diff --git a/framework/inc/filterflags.h b/framework/inc/filterflags.h
index 6b1d02178f..889371454f 100644
--- a/framework/inc/filterflags.h
+++ b/framework/inc/filterflags.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filterflags.h,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 30d6fd5f75..b5a608a141 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -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: framework.hrc,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/framework/inc/general.h b/framework/inc/general.h
index 865faa4475..2bb69a258a 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: general.h,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/helper/acceleratorinfo.hxx
index e3ab51bd78..bb529303df 100644
--- a/framework/inc/helper/acceleratorinfo.hxx
+++ b/framework/inc/helper/acceleratorinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorinfo.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx
index 92dd8e1764..41b930d7e5 100644
--- a/framework/inc/helper/actiontriggerhelper.hxx
+++ b/framework/inc/helper/actiontriggerhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: actiontriggerhelper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/helper/configimporter.hxx
index 97f3ddecf6..3072b8e6e8 100644
--- a/framework/inc/helper/configimporter.hxx
+++ b/framework/inc/helper/configimporter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configimporter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 13133a408d..b5188d60f5 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dockingareadefaultacceptor.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index eed35eee41..1bbd295e47 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imageproducer.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 435b87a4f2..5ba1428110 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -1,31 +1,28 @@
 /*************************************************************************

  *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: acceleratorinfo.hxx,v $

- * $Revision: 1.6 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
  ************************************************************************/

 

 #ifndef __MISC_HELPER_HXX_

diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index c67999382e..577b8a2672 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: networkdomain.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 5d7ee6e1be..dc19e7abf6 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ocomponentaccess.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index bdb031413b..d9e7792c39 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ocomponentenumeration.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 2e16c8f716..81943b0376 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oframes.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/otasksaccess.hxx b/framework/inc/helper/otasksaccess.hxx
index bb93792f78..13ba318be3 100644
--- a/framework/inc/helper/otasksaccess.hxx
+++ b/framework/inc/helper/otasksaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: otasksaccess.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx
index 7c67335ab4..5c63bfecc0 100644
--- a/framework/inc/helper/otasksenumeration.hxx
+++ b/framework/inc/helper/otasksenumeration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: otasksenumeration.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index cc141f37ae..60823cce91 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: persistentwindowstate.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/popupmenucontrollerbase.hxx b/framework/inc/helper/popupmenucontrollerbase.hxx
index 18bc9c29d9..c388659f04 100644
--- a/framework/inc/helper/popupmenucontrollerbase.hxx
+++ b/framework/inc/helper/popupmenucontrollerbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: popupmenucontrollerbase.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index b16e90730c..f56e20231d 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysetcontainer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index ac052c593a..2ae1da07ec 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shareablemutex.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index 0bc3f84e1e..786a07c2a5 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusindicator.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 848460ffb8..9cc1640355 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusindicatorfactory.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index d3aecdcb42..68da474818 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tagwindowasmodified.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx
index d952505ff4..a812110e4c 100644
--- a/framework/inc/helper/timerhelper.hxx
+++ b/framework/inc/helper/timerhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: timerhelper.hxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 96549bfe30..87a77e535c 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: titlebarupdate.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx
index 7c45980c62..b36c58878a 100644
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/helper/titlehelper.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: titlehelper.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index cffe6f6777..8396f2b1d8 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uiconfigelementwrapperbase.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index f5d992e9ea..0a985c2751 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uielementwrapperbase.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 0eb6508bb6..f680290983 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: vclstatusindicator.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 47b0dd969b..4f298c3ea6 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wakeupthread.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 89e80a40ed..596d508f4c 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpid.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/interaction/preventduplicateinteraction.hxx
index 5ba991bf32..92666da323 100644
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/interaction/preventduplicateinteraction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: preventduplicateinteraction.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 737802d513..220d392f8d 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stillinteraction.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 5b2da2f3ef..4a634f0192 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configaccess.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index c8df521a65..ccf8079e6f 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helponstartup.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 706710db4e..9a4541896e 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: job.hxx,v $
- * $Revision: 1.6.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index bcef2092a4..bbbbf2f279 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobconst.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 73dfbbf5fe..fb474e3cfd 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobdata.hxx,v $
- * $Revision: 1.7.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 8c426efa08..85e501e866 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobdispatch.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index 98d5e29230..ead1022df2 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobexecutor.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 5d5def166a..9d2a7c1419 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobresult.hxx,v $
- * $Revision: 1.4.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 4a34b6f49d..15cc4f37da 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: joburl.hxx,v $
- * $Revision: 1.4.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 68d5136da3..584430a1ba 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shelljob.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h
index bdcf841820..7dbc52dac9 100644
--- a/framework/inc/loadstate.h
+++ b/framework/inc/loadstate.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loadstate.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index 261f839fd3..b9bb57e1b3 100644
--- a/framework/inc/macros/debug.hxx
+++ b/framework/inc/macros/debug.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: debug.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index b61319ef03..c2b9b0b308 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: assertion.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index 4736f67cff..ef1f6ef7c5 100644
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/event.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: event.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index c008cb401d..0c743fc5b5 100644
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filterdbg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index 94b4affe5e..a8a8b49e1c 100644
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logmechanism.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 19d510fae9..b931d8297e 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: memorymeasure.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index aa65222696..78d282d2eb 100644
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/mutex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mutex.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index e4e1f8c64f..5093556389 100644
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: plugin.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index 891601058f..c580375aef 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: registration.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx
index 7adac10f1e..38e37167bf 100644
--- a/framework/inc/macros/debug/targeting.hxx
+++ b/framework/inc/macros/debug/targeting.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: targeting.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx
index e9561cb626..b2ddd644cb 100644
--- a/framework/inc/macros/debug/timemeasure.hxx
+++ b/framework/inc/macros/debug/timemeasure.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: timemeasure.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
index 27e6d3eec8..fed000186e 100644
--- a/framework/inc/macros/generic.hxx
+++ b/framework/inc/macros/generic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: generic.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 153f588322..b4103c8970 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: registration.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 703c974fb7..2b45fe9b24 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xinterface.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index ee2880a554..b53a78365b 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xserviceinfo.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index e7e2f3cf2c..f52775f3e6 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtypeprovider.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/makefile.mk b/framework/inc/makefile.mk
index 48f6d0ab8b..64ba2c1c57 100644
--- a/framework/inc/makefile.mk
+++ b/framework/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/inc/mediadescriptor.h b/framework/inc/mediadescriptor.h
index 8daf743e76..278f13463a 100644
--- a/framework/inc/mediadescriptor.h
+++ b/framework/inc/mediadescriptor.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediadescriptor.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/pch/precompiled_framework.cxx b/framework/inc/pch/precompiled_framework.cxx
index 54a269431b..0ce4985778 100644
--- a/framework/inc/pch/precompiled_framework.cxx
+++ b/framework/inc/pch/precompiled_framework.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_framework.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index eaffedbc0e..8e7496f6ea 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.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: precompiled_framework.hxx,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/framework/inc/properties.h b/framework/inc/properties.h
index 9bead3c4e7..9ba9acb376 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: properties.h,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index 129fdf742d..a55ed7b9f5 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: protocols.h,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 0d9cbb29b1..0100aa06c7 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: queries.h,v $
- * $Revision: 1.7.80.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index c52ec4ad2a..9481ee953e 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchrecordersupplier.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 5d3d248b3c..7600a5a8e3 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -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: services.h,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 55efef2335..376f059c07 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autorecovery.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index 3b7f8f904e..bace02bb0e 100644
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: backingcomp.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index fdf3c93c49..ef8cd8ad4f 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contenthandlerfactory.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 3e3fffaa7f..e45e88d758 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: desktop.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx
index cf7b9824fe..af0dea968d 100644
--- a/framework/inc/services/detectorfactory.hxx
+++ b/framework/inc/services/detectorfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: detectorfactory.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 7708a8944f..0d5c2f097d 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchhelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 48402d5720..0533f6a50a 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: frame.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.41.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx
index 41945500f2..5adce37d23 100644
--- a/framework/inc/services/frameloaderfactory.hxx
+++ b/framework/inc/services/frameloaderfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frameloaderfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 7df1747c7b..15421a3cae 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layoutmanager.hxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index ef498b10fa..6625b20278 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: license.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 7731455a50..159671d4de 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: licensedlg.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc
index 7842a5112a..30efc2e9e1 100644
--- a/framework/inc/services/logindialog.hrc
+++ b/framework/inc/services/logindialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logindialog.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 4aa4cf0971..d29ad82235 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logindialog.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index f8f5996f37..edd0a10ba4 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediatypedetectionhelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index cd06868614..aee943fe93 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: modulemanager.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index b94e1bb6a3..f1c51cb9b8 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pathsettings.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 46a8281c17..bcc967d226 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pluginframe.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index bc35993b79..33b638abe7 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sessionlistener.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 675d16ceb3..a0cabf43b7 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: substitutepathvars.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 0614397e21..b26681b2ec 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.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: urltransformer.hxx,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/framework/inc/services/task.hxx b/framework/inc/services/task.hxx
index 13181a1102..67418da6e9 100644
--- a/framework/inc/services/task.hxx
+++ b/framework/inc/services/task.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: task.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index d3f64e621c..d6326159a3 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: taskcreatorsrv.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 8be2c30dc1..39a8a31f5e 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uriabbreviation.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index df7b69dc91..716587be05 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: urltransformer.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 5af49e0178..9b22088541 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stdtypes.h,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -90,7 +87,7 @@ struct Int32HashCode
     {
         return (size_t)nValue;
     }
-};

+};
 
 struct KeyEventHashCode
 {
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 8e62e6fd3f..23bf91396e 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabwindow.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 28b2098943..72a949cb3f 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabwinfactory.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index e1bda640d4..5fe307e0bf 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: targets.h,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index 79e4b5b13e..7fbbe33da5 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fairrwlock.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index c48e264768..72edc58dd2 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gate.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h
index 3189c489be..ec02ef6628 100644
--- a/framework/inc/threadhelp/igate.h
+++ b/framework/inc/threadhelp/igate.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: igate.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/imutex.h b/framework/inc/threadhelp/imutex.h
index 39f243f134..39eae50811 100644
--- a/framework/inc/threadhelp/imutex.h
+++ b/framework/inc/threadhelp/imutex.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imutex.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h
index 951825005e..eb3748335b 100644
--- a/framework/inc/threadhelp/inoncopyable.h
+++ b/framework/inc/threadhelp/inoncopyable.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: inoncopyable.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h
index 89fc74dbfd..29cddb0d0c 100644
--- a/framework/inc/threadhelp/irwlock.h
+++ b/framework/inc/threadhelp/irwlock.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: irwlock.h,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 269aaf89d0..bc1b741c6c 100644
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itransactionmanager.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 138c88c3cf..82463f3988 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lockhelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index b0400aa076..42c8471ada 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: readguard.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index 9fdaa0b765..75bbf041fb 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resetableguard.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index ad19031f9a..10762b41b5 100644
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: threadhelpbase.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index b78d1c4959..6ae426e6ac 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transactionbase.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index e550cf169d..5e0ecc3b8b 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transactionguard.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index ad19c1c27e..b47837c80c 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transactionmanager.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index f96672188d..00a42fc0d2 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: writeguard.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index 4314479e91..f4e1069dad 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globalsettings.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index b98ad0f03c..9f7fd18269 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphicnameaccess.hxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index b7326f7e11..17e58359bd 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagemanager.hxx,v $
- * $Revision: 1.7.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 9eb927151f..005c79dcd4 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagetype.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 5e24d2a377..438589d17d 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleimagemanager.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 0de43a30cf..12b8147441 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleuicfgsupplier.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 05fd57f3d8..d5142173cf 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleuiconfigurationmanager.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index 0990715390..7934dc1af8 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uicategorydescription.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 66ebbd0f13..0eb920509a 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uiconfigurationmanager.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 7d78e981dc..ceb8383812 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: windowstateconfiguration.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 25cb01ee3e..208ffc370e 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: addonstoolbarmanager.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index 639d68301e..c318b5e338 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: addonstoolbarwrapper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index d32ea6b844..4583c7d01c 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: buttontoolbarcontroller.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index ffa2d64810..5b12ba200a 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: comboboxtoolbarcontroller.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index c4b7935448..4cb35cfbfb 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commandinfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 1c120fe71e..9f6e2bb7c4 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: complextoolbarcontroller.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 3032e262c8..847a85a7e7 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: constitemcontainer.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 1ab4391ddf..e4fb51780d 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlmenucontroller.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index a5002ec624..47ba1463a9 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dropdownboxtoolbarcontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 385f5cc6f4..89a061c8a3 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: edittoolbarcontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 4746d09d97..138ac23a50 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontmenucontroller.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index b111a02c35..eec506bc73 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontsizemenucontroller.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index e4669aa236..4731f8c55e 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: footermenucontroller.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 316c60da4f..fc8d284f52 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: generictoolbarcontroller.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 8440d5f706..c9ad4deeba 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: headermenucontroller.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index ce92d25d3b..f8e49002cf 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagebuttontoolbarcontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index e1933851c0..d8b082cd49 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemcontainer.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index fcd250a37f..ac57afd218 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: langselectionmenucontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index a4862b5b5e..9b0ba55e64 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: langselectionstatusbarcontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
index 32405f93df..f17d318e64 100644
--- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx
+++ b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logoimagestatusbarcontroller.hxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx
index 9b716af15a..deffe0749b 100644
--- a/framework/inc/uielement/logotextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logotextstatusbarcontroller.hxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 8d5b3e14f1..66d94097b9 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macrosmenucontroller.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 0832686000..3273b55eeb 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarmanager.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 1435b3db81..e4e930faaf 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarmerger.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index f10c66afe5..1a933ec066 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarwrapper.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index bdeb5bc871..6611c08123 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newmenucontroller.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 671a9f9a80..c6fa0c40ce 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectmenucontroller.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index b3942b56c2..a3e44a4272 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: progressbarwrapper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 8c646c9e6e..21559320fd 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recentfilesmenucontroller.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 0853c40d34..c7c04e4650 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rootitemcontainer.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index 0d0b92e764..9ce9b76431 100644
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletextstatusbarcontroller.hxx,v $
- * $Revision: 1.3.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index d7b73e1f5c..3bceb827f4 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spinfieldtoolbarcontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 9a526a42c4..68079e704d 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbar.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index bcda17c17a..3af9d1840a 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbarmanager.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 26663ace26..f9759b8d6f 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbarwrapper.hxx,v $
- * $Revision: 1.4.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 940fe8f1b2..eadce29a7f 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusindicatorinterfacewrapper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 218d7d1f17..22a994d427 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: togglebuttontoolbarcontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx
index 7db68ee9ed..b4e428bca6 100644
--- a/framework/inc/uielement/toolbar.hxx
+++ b/framework/inc/uielement/toolbar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbar.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 9f1c2cdaaa..97f02304c6 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarmanager.hxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 64e89a58fb..8016bbb620 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarmerger.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 22196995c7..766f2e8f97 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarsmenucontroller.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 342a19ad9a..d10158b102 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarwrapper.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 0e72cec566..879af10014 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uicommanddescription.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 4953f2076a..8e0fe15db4 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: addonstoolboxfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 7c5dd1d340..6d172733c9 100755..100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarcontrollerfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index 2895bbcaba..1c1ea52627 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarfactory.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
index 3d9a47641c..15748aceba 100644
--- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx
+++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: popupmenucontrollerfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
index c797771a6d..b38394902f 100644
--- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbarcontrollerfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index b586e10a27..d036b10fcd 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbarfactory.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
index f36a6a59f5..391bbc2352 100644
--- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarcontrollerfactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index 59f9f984f6..7ccaaaf8bb 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolboxfactory.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index 046062c388..1b2f786039 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uielementfactorymanager.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index 225e03e5fc..1bf86958d6 100644
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uielementfactorymanager.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index e633b010ba..61288ee0c7 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconfigurationreader.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index 057a03f69c..71c95c6e66 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconfigurationwriter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/acceleratorconst.hxx b/framework/inc/xml/acceleratorconst.hxx
index 8714573e36..1f85daf532 100644
--- a/framework/inc/xml/acceleratorconst.hxx
+++ b/framework/inc/xml/acceleratorconst.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconst.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index 5431cf1d58..af86fe984a 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventsconfiguration.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index 44f87697b6..c65e2b7427 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventsdocumenthandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 624508d1b0..b466916512 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagesconfiguration.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 52aa6d8e33..d5a142371c 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagesdocumenthandler.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx
index cff0e8d0ea..415d54cacf 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/xml/menuconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menuconfiguration.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index b6148ca820..07a2f1c48d 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menudocumenthandler.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 1dc04e46fb..67ebb8bf53 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: saxnamespacefilter.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index c27c4e6c4b..312ff2f6a7 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbardocumenthandler.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index e903135420..8b4243e35f 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolboxdocumenthandler.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
index 11d76ab340..e4611e79df 100644
--- a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolboxlayoutdocumenthandler.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 93073e4439..f5bd071947 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnamespaces.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
index 3570e3fc54..021a9aed5a 100644
--- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java
+++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckXModuleManager.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk
index 31abe27258..172914bd30 100644
--- a/framework/qa/complex/ModuleManager/makefile.mk
+++ b/framework/qa/complex/ModuleManager/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 6086c3bd24..45691205d1 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventTest.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk
index 1658a6db79..5fa820a03a 100644
--- a/framework/qa/complex/XUserInputInterception/makefile.mk
+++ b/framework/qa/complex/XUserInputInterception/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index 39936de4cd..0d3ba6ebd9 100644
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AcceleratorsConfigurationTest.java,v $
- * $Revision: 1.1.2.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/accelerators/helper/KeyMapping.java b/framework/qa/complex/accelerators/helper/KeyMapping.java
index fd22e05912..b0628e3cc7 100644
--- a/framework/qa/complex/accelerators/helper/KeyMapping.java
+++ b/framework/qa/complex/accelerators/helper/KeyMapping.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KeyMapping.java,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk
index 836b5abc88..f7fdbf0640 100644
--- a/framework/qa/complex/accelerators/helper/makefile.mk
+++ b/framework/qa/complex/accelerators/helper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.1.2.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk
index 0b84754a2b..50b570ef45 100644
--- a/framework/qa/complex/accelerators/makefile.mk
+++ b/framework/qa/complex/accelerators/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.1.2.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index d7bd096857..432182222e 100755..100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckAPI.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk
index 36556d6f03..a47fe7223e 100755..100644
--- a/framework/qa/complex/api_internal/makefile.mk
+++ b/framework/qa/complex/api_internal/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index 99088a91fb..5318b15bc1 100755..100644
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LoadDocument.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
index 6f20fc5aa4..bafb5c43fe 100755..100644
--- a/framework/qa/complex/broken_document/makefile.mk
+++ b/framework/qa/complex/broken_document/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk
index b9cfad982d..23a9bb1989 100644
--- a/framework/qa/complex/contextMenuInterceptor/makefile.mk
+++ b/framework/qa/complex/contextMenuInterceptor/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 693ebd12d9..21799e37ec 100755..100644
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DesktopTerminate.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk
index 22f1824d75..4e603b52d2 100755..100644
--- a/framework/qa/complex/desktop/makefile.mk
+++ b/framework/qa/complex/desktop/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index a3ea8457f3..358881519a 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: checkdispatchapi.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/helper/Interceptor.java
index 824d7f71e6..a5b6b25c69 100644
--- a/framework/qa/complex/dispatches/helper/Interceptor.java
+++ b/framework/qa/complex/dispatches/helper/Interceptor.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Interceptor.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/framework/qa/complex/dispatches/helper/makefile.mk
index ab8ad5c1d4..fac6dab072 100644
--- a/framework/qa/complex/dispatches/helper/makefile.mk
+++ b/framework/qa/complex/dispatches/helper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk
index cd74271e1a..c9d8a483b2 100644
--- a/framework/qa/complex/dispatches/makefile.mk
+++ b/framework/qa/complex/dispatches/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index 3cc11c950d..89dea19e08 100755..100644
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GetServiceWhileDisposingOffice.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk
index 1dd1194db1..d5707d42d1 100755..100644
--- a/framework/qa/complex/disposing/makefile.mk
+++ b/framework/qa/complex/disposing/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 4f939ca774..abcdb5b2de 100644
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoSave.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 065aebc101..11f6c4eeef 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Protocol.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk
index 1a2e633fb4..60a5921d1a 100644
--- a/framework/qa/complex/framework/autosave/makefile.mk
+++ b/framework/qa/complex/framework/autosave/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java
index 6e5ff031c4..98f4058d5d 100644
--- a/framework/qa/complex/framework/recovery/CrashThread.java
+++ b/framework/qa/complex/framework/recovery/CrashThread.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CrashThread.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index 70ab117f6a..7e41de80c6 100644
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: KlickButtonThread.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 8852d47efc..26115cc596 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RecoveryTest.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 972f8a9d89..28e9f2fd7c 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RecoveryTools.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/recovery/TimeoutThread.java b/framework/qa/complex/framework/recovery/TimeoutThread.java
index 4e30fc6d54..39016cf92b 100644
--- a/framework/qa/complex/framework/recovery/TimeoutThread.java
+++ b/framework/qa/complex/framework/recovery/TimeoutThread.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TimeoutThread.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk
index fb08f74383..68076d8747 100755..100644
--- a/framework/qa/complex/framework/recovery/makefile.mk
+++ b/framework/qa/complex/framework/recovery/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/interfaces/_XComponent.java
index 32c4245bd9..4e30848b28 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XComponent.java
+++ b/framework/qa/complex/imageManager/interfaces/_XComponent.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XComponent.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/interfaces/_XImageManager.java
index 375b523018..dba6a9c5ff 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java
+++ b/framework/qa/complex/imageManager/interfaces/_XImageManager.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XImageManager.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/interfaces/_XInitialization.java
index 592c7e2b2e..da95733167 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java
+++ b/framework/qa/complex/imageManager/interfaces/_XInitialization.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XInitialization.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
index 1b09703160..7ea641ca63 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XTypeProvider.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java
index 18f20c27c0..a1e9e75cab 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XUIConfiguration.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java
index f7d2c31dfc..0e029deb42 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java
+++ b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XUIConfigurationPersistence.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk
index d9da36437e..98f0f5bc2f 100755..100644
--- a/framework/qa/complex/imageManager/interfaces/makefile.mk
+++ b/framework/qa/complex/imageManager/interfaces/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk
index eb52b2beba..60a6ea8da8 100755..100644
--- a/framework/qa/complex/imageManager/makefile.mk
+++ b/framework/qa/complex/imageManager/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index a5f835203d..c6e822912a 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckXComponentLoader.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java
index 2e2c09c920..ff4bf87c4f 100644
--- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: InteractionHandler.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java
index 25767597d6..b67fc9fbd0 100644
--- a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StatusIndicator.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java
index 9471405e39..48f71d4573 100644
--- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StreamSimulator.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/qa/complex/loadAllDocuments/helper/makefile.mk
index 9ea874686c..1e1db93a20 100644
--- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk
+++ b/framework/qa/complex/loadAllDocuments/helper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk
index 8b43eb76c1..081ed0fd0c 100644
--- a/framework/qa/complex/loadAllDocuments/makefile.mk
+++ b/framework/qa/complex/loadAllDocuments/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 7e13315d5a..cc896a74ea 100755..100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PathSettingsTest.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk
index 605c95a684..4183dfc1bc 100755..100644
--- a/framework/qa/complex/path_settings/makefile.mk
+++ b/framework/qa/complex/path_settings/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index fe6d51df3c..27fe6410ec 100755..100644
--- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PathSubstitutionTest.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk
index 3ca7dadd99..fce5761930 100755..100644
--- a/framework/qa/complex/path_substitution/makefile.mk
+++ b/framework/qa/complex/path_substitution/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/complex/sequence/CheckSequenceOfEnum.java b/framework/qa/complex/sequence/CheckSequenceOfEnum.java
index 9ddfdc4d8b..a09703398f 100755..100644
--- a/framework/qa/complex/sequence/CheckSequenceOfEnum.java
+++ b/framework/qa/complex/sequence/CheckSequenceOfEnum.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckSequenceOfEnum.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/qa/complex/sequence/makefile.mk b/framework/qa/complex/sequence/makefile.mk
index 97b9e7dbb2..4bb9feeaec 100755..100644
--- a/framework/qa/complex/sequence/makefile.mk
+++ b/framework/qa/complex/sequence/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.76.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
index 69c76f3e89..b967b677b6 100755..100644
--- a/framework/qa/unoapi/makefile.mk
+++ b/framework/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index db62188f83..c92dc03710 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorcache.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 37de076226..37adf7b67f 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconfiguration.cxx,v $
- * $Revision: 1.7.204.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index a6b0bd7bce..ec9b750809 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorexecute.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx
index 82c86c6af9..f7453684d1 100644
--- a/framework/source/accelerators/acceleratorexecute.hxx
+++ b/framework/source/accelerators/acceleratorexecute.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorexecute.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 540a0f481a..87b8ecd9f1 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: documentacceleratorconfiguration.cxx,v $
- * $Revision: 1.9.244.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index acd8d1f03f..72399bc50f 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globalacceleratorconfiguration.cxx,v $
- * $Revision: 1.5.244.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index bb8d6ed6a7..986e1d8276 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: keymapping.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/makefile.mk b/framework/source/accelerators/makefile.mk
index 891ea9ca82..63f55f22a7 100644
--- a/framework/source/accelerators/makefile.mk
+++ b/framework/source/accelerators/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 36599063ce..8ffcc3d281 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleacceleratorconfiguration.cxx,v $
- * $Revision: 1.6.244.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 0937ee0888..499c229a53 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: presethandler.cxx,v $
- * $Revision: 1.17.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index dd4bf12e05..b8b930b0d4 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: storageholder.cxx,v $
- * $Revision: 1.8.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
index 4fd9e7c907..d792214254 100644
--- a/framework/source/application/framework.cxx
+++ b/framework/source/application/framework.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framework.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx
index 951e48f5d6..f94177be3c 100644
--- a/framework/source/application/login.cxx
+++ b/framework/source/application/login.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: login.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/application/makefile.mk b/framework/source/application/makefile.mk
index 69c02d3f43..2dcf4eedf3 100644
--- a/framework/source/application/makefile.mk
+++ b/framework/source/application/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/classes/actiontriggercontainer.cxx
index 95649fabd4..3f2476f4ff 100644
--- a/framework/source/classes/actiontriggercontainer.cxx
+++ b/framework/source/classes/actiontriggercontainer.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: actiontriggercontainer.cxx,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/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/classes/actiontriggerpropertyset.cxx
index 6a7231685a..e3b7b36508 100644
--- a/framework/source/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/classes/actiontriggerpropertyset.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: actiontriggerpropertyset.cxx,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/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/classes/actiontriggerseparatorpropertyset.cxx
index 49936d55ee..8b08bc9624 100644
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/classes/actiontriggerseparatorpropertyset.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: actiontriggerseparatorpropertyset.cxx,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/framework/source/classes/addonmenu.cxx b/framework/source/classes/addonmenu.cxx
index 35b61510ce..916b4d8ee4 100644
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/classes/addonmenu.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: addonmenu.cxx,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/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index b94d47c988..f82b68186d 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.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: addonsoptions.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index 6bee8c399d..90dc9a8638 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.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: bmkmenu.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/converter.cxx b/framework/source/classes/converter.cxx
index 1a3e8c99d2..c989f75743 100644
--- a/framework/source/classes/converter.cxx
+++ b/framework/source/classes/converter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: converter.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 2d10c049a8..ae08146abc 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: droptargetlistener.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index da8abace32..7b67dffc6a 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framecontainer.cxx,v $
- * $Revision: 1.24.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/classes/framelistanalyzer.cxx
index 84b9e97969..768055aede 100644
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/classes/framelistanalyzer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framelistanalyzer.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx
index ee7d193095..503fbeb81a 100644
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/classes/fwkresid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fwkresid.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index af8319c193..86cfde9f68 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.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: backingwindow.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index d8eeb18dee..3bcfe468c9 100755..100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FwlResId.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/classes/imagewrapper.cxx
index 7e001a9e41..6b43918828 100644
--- a/framework/source/classes/imagewrapper.cxx
+++ b/framework/source/classes/imagewrapper.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: imagewrapper.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/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
index c55af1cdf8..2e17c1e558 100644
--- a/framework/source/classes/makefile.mk
+++ b/framework/source/classes/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.36.82.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/classes/menuextensionsupplier.cxx
index 625ddfed93..f42afe3c18 100644
--- a/framework/source/classes/menuextensionsupplier.cxx
+++ b/framework/source/classes/menuextensionsupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menuextensionsupplier.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index b245cff3ad..893d78d9ec 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menumanager.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/classes/propertysethelper.cxx
index 5e1c2d5604..4fa9cc8871 100644
--- a/framework/source/classes/propertysethelper.cxx
+++ b/framework/source/classes/propertysethelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysethelper.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx
index 3a1c4131c5..d396f8bb9c 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/classes/protocolhandlercache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: protocolhandlercache.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 1371fa98eb..46fdf326d2 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resource.src,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/classes/rootactiontriggercontainer.cxx
index 7e18782300..0f58690337 100644
--- a/framework/source/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/classes/rootactiontriggercontainer.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: rootactiontriggercontainer.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/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/classes/sfxhelperfunctions.cxx
index f6d65257ad..ba68e3dfd8 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/classes/sfxhelperfunctions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxhelperfunctions.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 2ab4e33b50..b3793e386d 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: taskcreator.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx
index 16a13f49b1..5468e2fe72 100644
--- a/framework/source/constant/containerquery.cxx
+++ b/framework/source/constant/containerquery.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: containerquery.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx
index e5cd73a58d..239b365f56 100644
--- a/framework/source/constant/contenthandler.cxx
+++ b/framework/source/constant/contenthandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contenthandler.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/constant/filter.cxx b/framework/source/constant/filter.cxx
index 6ba2bf55ad..57d94d772e 100644
--- a/framework/source/constant/filter.cxx
+++ b/framework/source/constant/filter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filter.cxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx
index 6be05c4783..bfa125aa04 100644
--- a/framework/source/constant/frameloader.cxx
+++ b/framework/source/constant/frameloader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frameloader.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/constant/makefile.mk b/framework/source/constant/makefile.mk
index 0f304589cd..6740f3773c 100644
--- a/framework/source/constant/makefile.mk
+++ b/framework/source/constant/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index b49c29e2c8..1d22f43433 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: closedispatcher.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 0e6881601c..644b3f9315 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchinformationprovider.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 1dfee32e85..547cde496d 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchprovider.cxx,v $
- * $Revision: 1.37.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx
index 707219b908..c64f4eaabc 100644
--- a/framework/source/dispatch/helpagentdispatcher.cxx
+++ b/framework/source/dispatch/helpagentdispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpagentdispatcher.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/dispatch/interaction.cxx
index 1ca62f6c46..d5306eeec7 100644
--- a/framework/source/dispatch/interaction.cxx
+++ b/framework/source/dispatch/interaction.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interaction.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 1bb33a3350..270e58c392 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interceptionhelper.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index df6ee29a1e..fe5c70cf5a 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loaddispatcher.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 50a0762eb9..71f03ed03f 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailtodispatcher.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk
index 352aa66bfd..a46c8c57c2 100644
--- a/framework/source/dispatch/makefile.mk
+++ b/framework/source/dispatch/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index c7282fbcc9..9ca5b9ab3c 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menudispatcher.cxx,v $
- * $Revision: 1.23.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 0ac770a4f7..53eade5741 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oxt_handler.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 507f6a998f..567a332c44 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: popupmenudispatcher.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 63a6b625d6..a5a487ad02 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: servicehandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index def4f785be..521bddadc5 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: closedispatcher.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,15 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <dispatch/startmoduledispatcher.hxx>

-

+#include <dispatch/startmoduledispatcher.hxx>
+
 //_______________________________________________
 // my own includes
 
 #include <pattern/frame.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
-#include <classes/framelistanalyzer.hxx>

+#include <classes/framelistanalyzer.hxx>
 #include <dispatchcommands.h>
 #include <targets.h>
 #include <services.h>
@@ -95,8 +92,8 @@ StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::lan
                                              const ::rtl::OUString&                                        sTarget)
     : ThreadHelpBase     (&Application::GetSolarMutex() )
     , ::cppu::OWeakObject(                              )
-    , m_xSMGR            (xSMGR                         )

-    , m_xOwner           (xFrame                        )

+    , m_xSMGR            (xSMGR                         )
+    , m_xOwner           (xFrame                        )
     , m_sDispatchTarget  (sTarget                       )
     , m_lStatusListener  (m_aLock.getShareableOslMutex())
 {
@@ -120,18 +117,18 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
                                                               const css::uno::Sequence< css::beans::PropertyValue >&            /*lArguments*/,
                                                               const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
     throw(css::uno::RuntimeException)
-{

-    ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;

-    if (aURL.Complete.equals (CMD_UNO_SHOWSTARTMODULE))

-    {

-        nResult = css::frame::DispatchResultState::FAILURE;

-        if (implts_isBackingModePossible ())

-        {

-            if (implts_establishBackingMode ())

+{
+    ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
+    if (aURL.Complete.equals (CMD_UNO_SHOWSTARTMODULE))
+    {
+        nResult = css::frame::DispatchResultState::FAILURE;
+        if (implts_isBackingModePossible ())
+        {
+            if (implts_establishBackingMode ())
                 nResult = css::frame::DispatchResultState::SUCCESS;
-        }

-    }

-

+        }
+    }
+
     implts_notifyResultListener(xListener, nResult, css::uno::Any());
 }
 
@@ -163,39 +160,39 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere
 {
 }
 
-//-----------------------------------------------

-::sal_Bool StartModuleDispatcher::implts_isBackingModePossible ()

-{

-    if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE))

-        return sal_False;

-    

+//-----------------------------------------------
+::sal_Bool StartModuleDispatcher::implts_isBackingModePossible ()
+{
+    if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE))
+        return sal_False;
+    
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR;
     aReadLock.unlock();
     // <- SAFE ----------------------------------
-    

-    css::uno::Reference< css::frame::XFramesSupplier > xDesktop(

-        xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY);

-    

-    FrameListAnalyzer aCheck(

-        xDesktop,

-        css::uno::Reference< css::frame::XFrame >(),

-        FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT);

-    

-    ::sal_Bool  bIsPossible    = sal_False;

-    ::sal_Int32 nVisibleFrames = aCheck.m_lOtherVisibleFrames.getLength ();

-    

-    if (

-        ( ! aCheck.m_xBackingComponent.is ()) &&

-        (   nVisibleFrames < 1              )

-       )

-    {

-        bIsPossible = sal_True;

-    }

-    

+    
+    css::uno::Reference< css::frame::XFramesSupplier > xDesktop(
+        xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY);
+    
+    FrameListAnalyzer aCheck(
+        xDesktop,
+        css::uno::Reference< css::frame::XFrame >(),
+        FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT);
+    
+    ::sal_Bool  bIsPossible    = sal_False;
+    ::sal_Int32 nVisibleFrames = aCheck.m_lOtherVisibleFrames.getLength ();
+    
+    if (
+        ( ! aCheck.m_xBackingComponent.is ()) &&
+        (   nVisibleFrames < 1              )
+       )
+    {
+        bIsPossible = sal_True;
+    }
+    
     return bIsPossible;
-}

+}
 
 //-----------------------------------------------
 ::sal_Bool StartModuleDispatcher::implts_establishBackingMode()
@@ -205,16 +202,16 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR  = m_xSMGR;
     aReadLock.unlock();
     // <- SAFE ----------------------------------
-

-    css::uno::Reference< css::frame::XFrame > xDesktop         (xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY);

+
+    css::uno::Reference< css::frame::XFrame > xDesktop         (xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY);
     css::uno::Reference< css::frame::XFrame > xFrame           = xDesktop->findFrame (SPECIALTARGET_BLANK, 0);
-    css::uno::Reference< css::awt::XWindow  > xContainerWindow = xFrame->getContainerWindow ();

+    css::uno::Reference< css::awt::XWindow  > xContainerWindow = xFrame->getContainerWindow ();
 
     css::uno::Sequence< css::uno::Any > lArgs(1);
-    lArgs[0] <<= xContainerWindow;

+    lArgs[0] <<= xContainerWindow;
 
-    css::uno::Reference< css::frame::XController > xStartModule(

-        xSMGR->createInstanceWithArguments(SERVICENAME_STARTMODULE, lArgs),

+    css::uno::Reference< css::frame::XController > xStartModule(
+        xSMGR->createInstanceWithArguments(SERVICENAME_STARTMODULE, lArgs),
         css::uno::UNO_QUERY_THROW);
 
     css::uno::Reference< css::awt::XWindow > xComponentWindow(xStartModule, css::uno::UNO_QUERY);
@@ -239,6 +236,6 @@ void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Referenc
         aResult);
 
     xListener->dispatchFinished(aEvent);
-}

+}
 
 } // namespace framework
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 2ccf84fdb0..14f6758e97 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: systemexec.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 531d6807ee..519f38305b 100755..100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: windowcommanddispatch.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/acceleratorinfo.cxx b/framework/source/helper/acceleratorinfo.cxx
index 27f8e00937..f4f778a643 100644
--- a/framework/source/helper/acceleratorinfo.cxx
+++ b/framework/source/helper/acceleratorinfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorinfo.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 3224803892..899d18695f 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: actiontriggerhelper.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/configimporter.cxx b/framework/source/helper/configimporter.cxx
index a498451666..0bd4835c1f 100644
--- a/framework/source/helper/configimporter.cxx
+++ b/framework/source/helper/configimporter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configimporter.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index cf88201459..d7cfc18582 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dockingareadefaultacceptor.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index e698d7db1d..e83ac20f3c 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imageproducer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
index 7a2fc18168..f79baf6afe 100644
--- a/framework/source/helper/makefile.mk
+++ b/framework/source/helper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.34.82.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index 8e0f79b260..3bc9dccb75 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -1,76 +1,73 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- *

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: langselectionstatusbarcontroller.cxx,v $

- * $Revision: 1.6.40.1 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-// MARKER(update_precomp.py): autogen include statement, do not remove

-#include "precompiled_framework.hxx"

-

-#include <com/sun/star/lang/XMultiServiceFactory.hpp>

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-

-#include <tools/debug.hxx>

-#include <comphelper/processfactory.hxx>

-#include <helper/mischelper.hxx>

-#include <services.h>

-

-

-using namespace ::com::sun::star;

+
+#include <tools/debug.hxx>
+#include <comphelper/processfactory.hxx>
+#include <helper/mischelper.hxx>
+#include <services.h>
+
+
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-

-namespace framework

-{

-

-uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGuesser() const

-{

-    if (!m_xLanguageGuesser.is())

-    {

-        try

-        {

-            m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(

-                    m_xServiceManager->createInstance(

-                        rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),

-                        uno::UNO_QUERY );

-        }

-        catch (uno::Exception &r)

-        {

-            (void) r;

-            DBG_ASSERT( 0, "failed to get language guessing component" );

-        }    

-    }

-    return m_xLanguageGuesser;

-}

-

+
+namespace framework
+{
+
+uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGuesser() const
+{
+    if (!m_xLanguageGuesser.is())
+    {
+        try
+        {
+            m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
+                    m_xServiceManager->createInstance(
+                        rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+                        uno::UNO_QUERY );
+        }
+        catch (uno::Exception &r)
+        {
+            (void) r;
+            DBG_ASSERT( 0, "failed to get language guessing component" );
+        }    
+    }
+    return m_xLanguageGuesser;
+}
+
 ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
             ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
@@ -139,7 +136,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     }
 
     return aLabel;
-}

-    

-} // namespace framework

-

+}
+    
+} // namespace framework
+
diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/helper/networkdomain.cxx
index b31d67173b..4a93906e6a 100644
--- a/framework/source/helper/networkdomain.cxx
+++ b/framework/source/helper/networkdomain.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: networkdomain.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 274f3cdd6b..e79077937b 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ocomponentaccess.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index ed38666380..19a31e842c 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ocomponentenumeration.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 43f968225c..a39772f12c 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oframes.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index de7fa59eea..62a300fe01 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: persistentwindowstate.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx
index 8b6f75aa53..5da33e8a20 100644
--- a/framework/source/helper/popupmenucontrollerbase.cxx
+++ b/framework/source/helper/popupmenucontrollerbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: popupmenucontrollerbase.cxx,v $
- * $Revision: 1.8.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx
index 0d3bb857e9..4fef4c8c08 100644
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/helper/propertysetcontainer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertysetcontainer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/shareablemutex.cxx b/framework/source/helper/shareablemutex.cxx
index f84d42d1a5..26f64f9f87 100644
--- a/framework/source/helper/shareablemutex.cxx
+++ b/framework/source/helper/shareablemutex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shareablemutex.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 2c4094b57f..f38a84fdb7 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusindicator.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index d9ba66fd06..c4ae4d35f2 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusindicatorfactory.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -438,12 +435,12 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
     Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
     if ( pWindow )
     {
-        bool bForceFrontAndFocus(false);

-        ::comphelper::ConfigurationHelper::readDirectKey(

-            xSMGR,

-            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),

-            ::rtl::OUString::createFromAscii("NewDocumentHandling"),

-            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),

+        bool bForceFrontAndFocus(false);
+        ::comphelper::ConfigurationHelper::readDirectKey(
+            xSMGR,
+            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
+            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
+            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
             ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
 
         pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index ea6f7ca148..21a4254f85 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tagwindowasmodified.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 1db613237d..cb01c53244 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: titlebarupdate.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx
index 2eb1707ae3..5c89b1983e 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/helper/titlehelper.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: titlehelper.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.4.54.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 23ac2c8a79..2124ba124d 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uiconfigelementwrapperbase.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 64a08326e7..0876f02aac 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uielementwrapperbase.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 9c46b0e082..bd81f56481 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: vclstatusindicator.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 38921660fa..34df034250 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wakeupthread.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 24a71a679f..5288db3236 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorcache.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 57d0001217..7169b016b0 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconfiguration.hxx,v $
- * $Revision: 1.5.300.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index d95feb3c62..8e8023be5e 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: documentacceleratorconfiguration.hxx,v $
- * $Revision: 1.7.300.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index 9c6517ac08..70861166c8 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globalacceleratorconfiguration.hxx,v $
- * $Revision: 1.4.300.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index 7b44676091..4b74ddcaa9 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: istoragelistener.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index a8e25a4475..89114027dc 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: keymapping.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index e57ef45ad1..115327fd04 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleacceleratorconfiguration.hxx,v $
- * $Revision: 1.4.300.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 4b226b106b..505e54ee00 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: presethandler.hxx,v $
- * $Revision: 1.9.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index dce603e7c5..49257db8ea 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: storageholder.hxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx
index 5e0fcc4964..4d51b2586e 100644
--- a/framework/source/inc/constant/containerquery.hxx
+++ b/framework/source/inc/constant/containerquery.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: containerquery.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx
index 3a5a63bd0c..db10575ce8 100644
--- a/framework/source/inc/constant/contenthandler.hxx
+++ b/framework/source/inc/constant/contenthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contenthandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/constant/filter.hxx b/framework/source/inc/constant/filter.hxx
index 80696a2279..141440a777 100644
--- a/framework/source/inc/constant/filter.hxx
+++ b/framework/source/inc/constant/filter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filter.hxx,v $
- * $Revision: 1.4.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx
index b757c5ea0a..58e03638d3 100644
--- a/framework/source/inc/constant/frameloader.hxx
+++ b/framework/source/inc/constant/frameloader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frameloader.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index fbd2bf61f4..63ec4c4f28 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loaddispatcher.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx
index 9b425077c4..262520e74e 100644
--- a/framework/source/inc/dispatch/uieventloghelper.hxx
+++ b/framework/source/inc/dispatch/uieventloghelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uieventloghelper.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index c986c7eaa8..782fec1cb1 100755..100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: windowcommanddispatch.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 3a6f2a5b57..5e1eaf6403 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: actionlockguard.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/loadenv/loaddispatchlistener.hxx b/framework/source/inc/loadenv/loaddispatchlistener.hxx
index fea3dab621..2ae8a99232 100644
--- a/framework/source/inc/loadenv/loaddispatchlistener.hxx
+++ b/framework/source/inc/loadenv/loaddispatchlistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loaddispatchlistener.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index ed73c0a859..464401dda4 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loadenv.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 4ba70befcb..45282fb252 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loadenvexception.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index acb2311367..179ec117ab 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: targethelper.hxx,v $
- * $Revision: 1.6.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 94728bcb24..d2048b679f 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configuration.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 16167e39ce..18bfd8491e 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frame.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx
index 4bd75a3c22..4c0b0508da 100644
--- a/framework/source/inc/pattern/storages.hxx
+++ b/framework/source/inc/pattern/storages.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: storages.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index e23d6bf04d..39634f2579 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: window.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk
index 4ae3564c21..f6b92b97d8 100644
--- a/framework/source/interaction/makefile.mk
+++ b/framework/source/interaction/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5.82.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx
index bd97ef1d2a..d70ca3107d 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/interaction/preventduplicateinteraction.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: preventduplicateinteraction.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 83c7675b26..27bc601fb6 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.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: QuietInteraction.cxx,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/framework/source/jobs/configaccess.cxx b/framework/source/jobs/configaccess.cxx
index 848ec30142..ae5828f2c6 100644
--- a/framework/source/jobs/configaccess.cxx
+++ b/framework/source/jobs/configaccess.cxx
@@ -1,13 +1,10 @@
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configaccess.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 0c47659339..abb2a91a8f 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helponstartup.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 3a0ead1ecc..7989403e18 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: job.cxx,v $
- * $Revision: 1.12.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx
index 2c10e35a3b..80c5b1f58f 100644
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/jobs/jobconst.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobconst.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index bb04f4f09f..92bc6fd680 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -1,13 +1,10 @@
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobdata.cxx,v $
- * $Revision: 1.10.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 010123a81a..635c58f082 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -1,13 +1,10 @@
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobdispatch.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 470e1fa397..71920662d9 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobexecutor.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index 98a0821180..146734c3cf 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -1,13 +1,10 @@
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: jobresult.cxx,v $
- * $Revision: 1.8.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index ec47dadb85..59e6384a0e 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: joburl.cxx,v $
- * $Revision: 1.6.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/jobs/makefile.mk b/framework/source/jobs/makefile.mk
index 090bc3dbfc..df1de28a62 100644
--- a/framework/source/jobs/makefile.mk
+++ b/framework/source/jobs/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 0bafb763a4..a600fb176f 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shelljob.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index f4d4f2ce7e..1059669834 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.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: layoutmanager.cxx,v $
- * $Revision: 1.72 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk
index b9b6bcf248..8033301a4f 100644
--- a/framework/source/layoutmanager/makefile.mk
+++ b/framework/source/layoutmanager/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/loadenv/loaddispatchlistener.cxx b/framework/source/loadenv/loaddispatchlistener.cxx
index eb1859b048..dcf1652d9a 100644
--- a/framework/source/loadenv/loaddispatchlistener.cxx
+++ b/framework/source/loadenv/loaddispatchlistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loaddispatchlistener.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index d131a3b6e8..8d0b098a1e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loadenv.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -1750,18 +1747,18 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
     Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if ( pWindow )
     {
-        bool bForceFrontAndFocus(false);

-        css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey(

-            xSMGR,

-            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),

-            ::rtl::OUString::createFromAscii("NewDocumentHandling"),

-            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),

-            ::comphelper::ConfigurationHelper::E_READONLY);

+        bool bForceFrontAndFocus(false);
+        css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey(
+            xSMGR,
+            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
+            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
+            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+            ::comphelper::ConfigurationHelper::E_READONLY);
         a >>= bForceFrontAndFocus;
 
         pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
     }
-    

+    
 /* #i19976#
     We tried to prevent a toFront() call in case the user putted the
     loading document into the background ..
diff --git a/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk
index e0fa0940f5..e05e92e44d 100644
--- a/framework/source/loadenv/makefile.mk
+++ b/framework/source/loadenv/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx
index c8681a5b2c..6abd17aa0e 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: targethelper.cxx,v $
- * $Revision: 1.6.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 9ad3f696d6..7716fb45e7 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchrecorder.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 8c7b601b4a..f7baf25a3c 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchrecordersupplier.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/recording/makefile.mk b/framework/source/recording/makefile.mk
index 770fbf7412..e4751b76b8 100644
--- a/framework/source/recording/makefile.mk
+++ b/framework/source/recording/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/register/makefile.mk b/framework/source/register/makefile.mk
index 1e15c55bd2..7f6d1a28a4 100644
--- a/framework/source/register/makefile.mk
+++ b/framework/source/register/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index 9882476b60..0fec88f913 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: register3rdcomponents.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index b9419068be..e36e2a835a 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: registerlogindialog.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index c7ef3da666..c5ff37d67d 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.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: registerservices.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 2297346ae5..c8ffef75b4 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: registertemp.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 84bcce256c..8bb90262c3 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: autorecovery.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index b769e0a89e..09997ab473 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: backingcomp.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 17bf03da0e..9c7e3426aa 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backingwindow.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 36cd692513..a08ebd0a43 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backingwindow.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index fd983ed492..0f569575f1 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktop.cxx,v $
- * $Revision: 1.64.80.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 0413cbfdbc..be8e666ee9 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatchhelper.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 1d63a503b2..51ea38b555 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: frame.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.106.80.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index 8a10752c81..7e2ee3253e 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -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: fwk_services.src,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/framework/source/services/license.cxx b/framework/source/services/license.cxx
index c34d7908d1..6ac5bf07a0 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.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: license.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
index a7360e854e..90c32fcfb8 100644
--- a/framework/source/services/makefile.mk
+++ b/framework/source/services/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.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index b5b7cfe062..acc2bbd916 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mediatypedetectionhelper.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx
index 30050b88fd..90aa3d30e4 100644
--- a/framework/source/services/menudocumenthandler.cxx
+++ b/framework/source/services/menudocumenthandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menudocumenthandler.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 2bb57c30ad..4491357bd4 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: modulemanager.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 8871fea734..b8eb9f5641 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pathsettings.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 836f6c88ed..b3d6a60486 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sessionlistener.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index ee766efeee..c9e6bc11ba 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: substitutepathvars.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 71136a9ac4..5a8015bbbc 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.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: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 363767e75f..91ecdec2dd 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: taskcreatorsrv.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index c7655f5cc5..bb81880938 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uriabbreviation.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index f04827592e..13225f728f 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.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: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/tabwin/makefile.mk b/framework/source/tabwin/makefile.mk
index 64dd01d038..18c3a8140f 100644
--- a/framework/source/tabwin/makefile.mk
+++ b/framework/source/tabwin/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 72d7b4a1c5..5eda030f35 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabwindow.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index bde6ef7524..0e9ee5ee05 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabwinfactory.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx
index 9539dcfc2d..e1b673118e 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/threadhelp/lockhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lockhelper.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/threadhelp/makefile.mk b/framework/source/threadhelp/makefile.mk
index aa89ce09cd..97a3ff2698 100644
--- a/framework/source/threadhelp/makefile.mk
+++ b/framework/source/threadhelp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/threadhelp/transactionmanager.cxx
index 17b06afa67..8d4c99e2e3 100644
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/threadhelp/transactionmanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transactionmanager.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index cec8db173f..de1989e5da 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globalsettings.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 658d18df01..ab5ac2f6d3 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphicnameaccess.cxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 18eb67dea3..5de76f0ed6 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagemanager.cxx,v $
- * $Revision: 1.16.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 2ba2e105d3..9c43867383 100755..100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ImageManagerImpl.cxx,v $
- * $Revision: 1.16.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index e5201e9a9b..ac37361dfc 100755..100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagemanager.hxx,v $
- * $Revision: 1.7.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk
index 3ef9006072..6e5460401b 100644
--- a/framework/source/uiconfiguration/makefile.mk
+++ b/framework/source/uiconfiguration/makefile.mk
@@ -1,14 +1,10 @@
 
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 2273c1d641..896a1cfd7f 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleimagemanager.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 8123813718..8fa52034b7 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.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: moduleuicfgsupplier.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 7d2bf4fd54..cad2e98a74 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: moduleuiconfigurationmanager.cxx,v $
- * $Revision: 1.19.208.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 739130ae4c..5cb681b8bc 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.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: uicategorydescription.cxx,v $
- * $Revision: 1.8.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 35b35c339e..f0f7e9db0d 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uiconfigurationmanager.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index dbce0028fb..c0b6136ebd 100755..100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UIConfigurationManagerImpl.cxx,v $
- * $Revision: 1.19.208.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
index 937aca2a9a..b89a150fcc 100755..100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UIConfigurationManagerImpl.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index c97caecc01..a5140d6ba0 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.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: windowstateconfiguration.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/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index ad3c5fbfaf..921b92d667 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.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: addonstoolbarmanager.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index da40a4ee01..1d83453ddc 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.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: addonstoolbarwrapper.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/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 855f1dd3f4..d5857418a4 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.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: buttontoolbarcontroller.cxx,v $
- * $Revision: 1.8.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 937c099aaf..7135ea1adc 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.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: comboboxtoolbarcontroller.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/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 3b5d197261..38682f2e48 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.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: complextoolbarcontroller.cxx,v $
- * $Revision: 1.10.26.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/uielement/constitemcontainer.cxx
index 91fb93f55c..f0bd46667b 100644
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/uielement/constitemcontainer.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: constitemcontainer.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/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index bb33aa6c89..d52c4df705 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlmenucontroller.cxx,v $
- * $Revision: 1.11.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index e9910d6b45..9613d8fc14 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.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: dropdownboxtoolbarcontroller.cxx,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/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 5faefa9282..fc4847b2be 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.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: edittoolbarcontroller.cxx,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/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 24e879b5ad..feef79c7f8 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontmenucontroller.cxx,v $
- * $Revision: 1.10.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 56a14f4ba4..ad3a9d55af 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontsizemenucontroller.cxx,v $
- * $Revision: 1.10.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 182a6c3694..05fd268b9d 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: footermenucontroller.cxx,v $
- * $Revision: 1.10.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 311776c1bd..1babfbe38c 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.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: generictoolbarcontroller.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 3ab8386c87..6fe6ede85f 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: headermenucontroller.cxx,v $
- * $Revision: 1.10.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 954b102924..43bf881c2c 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.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: imagebuttontoolbarcontroller.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/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx
index b0fc5d385f..598d0bceef 100644
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/uielement/itemcontainer.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: itemcontainer.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/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index a2f8ec271a..e7375d71ec 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.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: langselectionmenucontroller.cxx,v $
- * $Revision: 1.6.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index a99c60a10e..f525aa9d31 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.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: langselectionstatusbarcontroller.cxx,v $
- * $Revision: 1.6.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index 7158ccae23..006a7702bf 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logoimagestatusbarcontroller.cxx,v $
- * $Revision: 1.7.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index e11bfd1223..7d82d5e919 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logotextstatusbarcontroller.cxx,v $
- * $Revision: 1.6.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 65385b780c..922e27d047 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macrosmenucontroller.cxx,v $
- * $Revision: 1.12.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
index 568be10c0d..1dacbc6cf0 100644
--- a/framework/source/uielement/makefile.mk
+++ b/framework/source/uielement/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index f5991c9d86..b1d19b56d5 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarmanager.cxx,v $
- * $Revision: 1.52.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 9e497b62c1..12fd9105ad 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarmerger.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index ea4af2ef58..f1786d6b71 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.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: menubarwrapper.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 7dc52b4f5a..962e8530d3 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newmenucontroller.cxx,v $
- * $Revision: 1.12.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 16be5513e2..0eb391c96c 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectmenucontroller.cxx,v $
- * $Revision: 1.10.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index e35aec55f6..da644e90e3 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: progressbarwrapper.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 7ab450d59c..0d46606c6d 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recentfilesmenucontroller.cxx,v $
- * $Revision: 1.9.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx
index 6275f2a7a8..a744963cf1 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/uielement/rootitemcontainer.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: rootitemcontainer.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/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index 20fdf961f0..e6a1c18b6d 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletextstatusbarcontroller.cxx,v $
- * $Revision: 1.5.82.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 12aa429d8c..f88a452e56 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.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: spinfieldtoolbarcontroller.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/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index c8c1618879..11d2fae87e 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbar.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 6c1cdf44f0..cdae823561 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbarmanager.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index d016dbac10..59ac9fd2f8 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.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: statusbarwrapper.cxx,v $
- * $Revision: 1.8.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 5c11a87b24..c0dd296475 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.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: statusindicatorinterfacewrapper.cxx,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/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index b803edb1c3..71fb911b68 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.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: togglebuttontoolbarcontroller.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/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx
index eed4602e96..28e3058364 100644
--- a/framework/source/uielement/toolbar.cxx
+++ b/framework/source/uielement/toolbar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbar.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 7451f6888c..4296985ff8 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.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: toolbarmanager.cxx,v $
- * $Revision: 1.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 5c119e5559..83f280cb46 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarmerger.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index f0359f3fba..c438523a5f 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarsmenucontroller.cxx,v $
- * $Revision: 1.21.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 59b696763a..1aef91a46c 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.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: toolbarwrapper.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/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index e13ed0e974..db3347b3e5 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.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: uicommanddescription.cxx,v $
- * $Revision: 1.17.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index c41213d6d2..bcd9c65ac3 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.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: addonstoolboxfactory.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/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 58ff92e5a8..0c27ce0daa 100755..100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConfigurationAccess_ControllerFactory.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uifactory/makefile.mk b/framework/source/uifactory/makefile.mk
index d5805faba8..9758c9937a 100644
--- a/framework/source/uifactory/makefile.mk
+++ b/framework/source/uifactory/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index f07700c20b..b37e57d30a 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menubarfactory.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
index 5c9ccdaca2..b7324b968d 100644
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: popupmenucontrollerfactory.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
index b5364b3fb7..eeb3cd64a5 100644
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statusbarcontrollerfactory.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 07303c55e7..8ec728063d 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.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: statusbarfactory.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/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
index 8bff439d50..35d9c9feef 100644
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarcontrollerfactory.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index 3540c81c3c..61ec1f6fca 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.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: toolboxfactory.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/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 67e6a936b0..a739a8e726 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uielementfactorymanager.cxx,v $
- * $Revision: 1.10.12.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 7ac9f08901..8a2e341416 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uielementfactorymanager.cxx,v $
- * $Revision: 1.10.12.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 7db40c5e73..4f74915f69 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconfigurationreader.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 6954314a54..30e70017c4 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acceleratorconfigurationwriter.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/xml/eventsconfiguration.cxx
index 320f94b8a6..d81726225b 100644
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/xml/eventsconfiguration.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: eventsconfiguration.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/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/xml/eventsdocumenthandler.cxx
index f160ffe895..62d9aed3d2 100644
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/xml/eventsdocumenthandler.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: eventsdocumenthandler.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/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index 995da41240..882a564da5 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.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: imagesconfiguration.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/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index ceb187c322..aa9f2d66f5 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.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: imagesdocumenthandler.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/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk
index 2d610ca0f3..e549b49c15 100644
--- a/framework/source/xml/makefile.mk
+++ b/framework/source/xml/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/xml/menuconfiguration.cxx
index 7dbe62e38a..2c8449fbbc 100644
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/xml/menuconfiguration.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: menuconfiguration.cxx,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/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx
index 66addd1274..fc03978006 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.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: menudocumenthandler.cxx,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/framework/source/xml/saxnamespacefilter.cxx b/framework/source/xml/saxnamespacefilter.cxx
index 06ba54932b..389067ef3c 100644
--- a/framework/source/xml/saxnamespacefilter.cxx
+++ b/framework/source/xml/saxnamespacefilter.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: saxnamespacefilter.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/framework/source/xml/statusbarconfiguration.cxx b/framework/source/xml/statusbarconfiguration.cxx
index 618afd6796..f482177585 100644
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/xml/statusbarconfiguration.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: statusbarconfiguration.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/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/xml/statusbardocumenthandler.cxx
index 321239d03c..ec8bd84b12 100644
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/xml/statusbardocumenthandler.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: statusbardocumenthandler.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/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx
index 24c1e8840f..c7911bf89d 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/xml/toolboxconfiguration.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: toolboxconfiguration.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/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index 53098b1687..21961a71f8 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.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: toolboxdocumenthandler.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/xml/toolboxlayoutdocumenthandler.cxx
index cbc5a35964..a3dfc1c59e 100644
--- a/framework/source/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/xml/toolboxlayoutdocumenthandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolboxlayoutdocumenthandler.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/xml/xmlnamespaces.cxx
index bfe32e18eb..7576a1de45 100644
--- a/framework/source/xml/xmlnamespaces.cxx
+++ b/framework/source/xml/xmlnamespaces.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: xmlnamespaces.cxx,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/framework/test/makefile.mk b/framework/test/makefile.mk
index e341484b14..b826f7aa58 100644
--- a/framework/test/makefile.mk
+++ b/framework/test/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/test/test.cxx b/framework/test/test.cxx
index 2aaad82ce3..d93308d110 100644
--- a/framework/test/test.cxx
+++ b/framework/test/test.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index 6c19a0d52d..de2a0e2308 100644
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: threadtest.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
index bc9e22ba6c..1ccc16f74b 100644
--- a/framework/test/threadtest/makefile.mk
+++ b/framework/test/threadtest/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index 0514afd061..623b16c257 100644
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: threadtest.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index bdd4a8375f..8d4d245c73 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgview.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
index cc418cf8bd..8e8ce627c7 100644
--- a/framework/test/typecfg/makefile.mk
+++ b/framework/test/typecfg/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx
index 8977f66e00..ea8de657c0 100644
--- a/framework/test/typecfg/typecfg.cxx
+++ b/framework/test/typecfg/typecfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: typecfg.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index b8bc0d1960..3f86cd04ba 100644
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -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: xml2xcd.cxx,v $
- *
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -297,7 +293,7 @@ void XCDGenerator::Main()
 *//*-*************************************************************************************************************/
 void XCDGenerator::impl_printCopyright()
 {
-    fprintf( stderr, "\n(c) Copyright by Sun microsystems, 2001\n" );
+    fprintf( stderr, "\n(c) Copyright 2000, 2010 Oracle and/or its affiliates.\n" );
 }
 
 //*****************************************************************************************************************
@@ -526,14 +522,10 @@ void XCDGenerator::impl_generateCopyright()
     m_aData.sBufferStandard.appendAscii( "<!-- \n"                                                                     );
     m_aData.sBufferStandard.appendAscii( "  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"           );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
-    m_aData.sBufferStandard.appendAscii( "   Copyright 2008 by Sun Microsystems, Inc.\n"                               );
+    m_aData.sBufferStandard.appendAscii( "   Copyright 2000, 2010 Oracle and/or its affiliates.\n"                               );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
     m_aData.sBufferStandard.appendAscii( "   OpenOffice.org - a multi-platform office productivity suite\n"            );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
-    m_aData.sBufferStandard.appendAscii( "   $RCSfile: xml2xcd.cxx,v $\n"                                               );
-    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
-    m_aData.sBufferStandard.appendAscii( "   $Revision: 1.12 $\n"                                                       );
-    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
     m_aData.sBufferStandard.appendAscii( "   This file is part of OpenOffice.org.\n"                                   );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
     m_aData.sBufferStandard.appendAscii( "   OpenOffice.org is free software: you can redistribute it and/or modify\n" );
@@ -560,14 +552,10 @@ void XCDGenerator::impl_generateCopyright()
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"           );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
-        m_aData.sBufferAdditional.appendAscii( "  Copyright 2008 by Sun Microsystems, Inc.\n"                                );
+        m_aData.sBufferAdditional.appendAscii( "  Copyright 2000, 2010 Oracle and/or its affiliates.\n"                                );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org - a multi-platform office productivity suite\n"             );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
-        m_aData.sBufferAdditional.appendAscii( "  $RCSfile: xml2xcd.cxx,v $\n"                                                );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
-        m_aData.sBufferAdditional.appendAscii( "  $Revision: 1.12 $\n"                                                        );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  This file is part of OpenOffice.org.\n"                                    );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org is free software: you can redistribute it and/or modify\n"  );
diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
index 92dbaceafa..43655d91e8 100644
--- a/framework/util/guiapps/makefile.mk
+++ b/framework/util/guiapps/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/util/hidother.src b/framework/util/hidother.src
index c4c5787df1..90c4d8f4d4 100644
--- a/framework/util/hidother.src
+++ b/framework/util/hidother.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 0a07f3cf13..03784d1195 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/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.124.26.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/util/makefile.pmk b/framework/util/makefile.pmk
index b239f53f45..a5176e40c2 100644
--- a/framework/util/makefile.pmk
+++ b/framework/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/framework/util/target.pmk b/framework/util/target.pmk
index 67a781dff6..4e6b0caf14 100644
--- a/framework/util/target.pmk
+++ b/framework/util/target.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: target.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx
index 400595e263..1dfbaea7f4 100644
--- a/idl/inc/attrib.hxx
+++ b/idl/inc/attrib.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attrib.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 64c399d69c..d03443d87e 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basobj.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 3ab57d19bc..14373c929d 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bastype.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx
index 3a4584b199..fc8045f0ba 100644
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: char.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index b76e856cfd..1159b84e6e 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: command.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 3a3e033e91..c9c448e196 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: database.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ca0d879286..c3e841df05 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globals.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 400afd54b8..2749181d59 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hash.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 620cfd0a9f..fb5ec6b166 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lex.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/makefile.mk b/idl/inc/makefile.mk
index 8165221dff..b3e9181162 100644
--- a/idl/inc/makefile.mk
+++ b/idl/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 0f0e83f25a..d616c33541 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: module.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 1329afb3ad..e26a42db8f 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: object.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx
index ecc5d04c1e..7ab1f99c47 100644
--- a/idl/inc/pch/precompiled_idl.cxx
+++ b/idl/inc/pch/precompiled_idl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_idl.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx
index a4fd6606bc..3f2ba01343 100644
--- a/idl/inc/pch/precompiled_idl.hxx
+++ b/idl/inc/pch/precompiled_idl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_idl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 1cd5769d56..6f6220aac2 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: slot.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index c8f3102848..176208718c 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: types.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index 38436f08ca..9f7272ee45 100644
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: char.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 97f5960b13..0c7985e05e 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hash.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index d76bc88094..117e8ae976 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lex.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/cmptools/makefile.mk b/idl/source/cmptools/makefile.mk
index 161c011346..da7e41991a 100644
--- a/idl/source/cmptools/makefile.mk
+++ b/idl/source/cmptools/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 68a4706138..4b01504ffb 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basobj.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 4c9d9bb089..ac046dfdaa 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.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: bastype.cxx,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/idl/source/objects/makefile.mk b/idl/source/objects/makefile.mk
index c866bce363..2629749343 100644
--- a/idl/source/objects/makefile.mk
+++ b/idl/source/objects/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index eeb59e4279..71d0c567a7 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: module.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 18a5a23894..029007310c 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: object.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 28ef205d71..af0ad46623 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: slot.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index cf84ba229b..727073da87 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: types.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 861b809127..434a431c8a 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.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: command.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/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 36aeae40f6..ce64a5edf1 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: database.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 8e75479346..83a730e404 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.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: globals.cxx,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/idl/source/prj/idldll.cxx b/idl/source/prj/idldll.cxx
index 78689100e5..607cc91e1b 100644
--- a/idl/source/prj/idldll.cxx
+++ b/idl/source/prj/idldll.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: idldll.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk
index 944ae75c04..ee7672e485 100644
--- a/idl/source/prj/makefile.mk
+++ b/idl/source/prj/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 40ea9f78dd..d003ff2e58 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svidl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/util/idlpch.cxx b/idl/util/idlpch.cxx
index 482a9ebf98..7421e04ca5 100644
--- a/idl/util/idlpch.cxx
+++ b/idl/util/idlpch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: idlpch.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/idl/util/makefile.mk b/idl/util/makefile.mk
index 8adebf8655..888b70aa8a 100644
--- a/idl/util/makefile.mk
+++ b/idl/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/hyphdta.hxx
index 1d387206b9..f0747e0bb6 100644
--- a/linguistic/inc/hyphdta.hxx
+++ b/linguistic/inc/hyphdta.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphdta.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 4305d7234a..49b4404207 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iprcache.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/lngprophelp.hxx
index ef5e913af4..e8cea0fe05 100644
--- a/linguistic/inc/lngprophelp.hxx
+++ b/linguistic/inc/lngprophelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prophelp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx
index 41052f9eb1..57bccaeb09 100644
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/lngprops.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngprops.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/makefile.mk b/linguistic/inc/makefile.mk
index 7fa7e867c8..80e153427f 100644
--- a/linguistic/inc/makefile.mk
+++ b/linguistic/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx
index 803341bb8b..53dfa50e0e 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/misc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: misc.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/pch/precompiled_linguistic.cxx b/linguistic/inc/pch/precompiled_linguistic.cxx
index 98fc71f28d..bc06ba5df3 100644
--- a/linguistic/inc/pch/precompiled_linguistic.cxx
+++ b/linguistic/inc/pch/precompiled_linguistic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_linguistic.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/pch/precompiled_linguistic.hxx b/linguistic/inc/pch/precompiled_linguistic.hxx
index c0ed3ac0b2..8f0a3f8c02 100644
--- a/linguistic/inc/pch/precompiled_linguistic.hxx
+++ b/linguistic/inc/pch/precompiled_linguistic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_linguistic.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/spelldta.hxx
index 0d3022db7d..aadfd34570 100644
--- a/linguistic/inc/spelldta.hxx
+++ b/linguistic/inc/spelldta.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spelldta.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx
index 780389b277..82b52f29a6 100644
--- a/linguistic/inc/thesdta.hxx
+++ b/linguistic/inc/thesdta.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdta.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
index 233bc71d16..8f596e61d9 100644
--- a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
+++ b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HangulHanjaConversion.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk
index b53b25c76c..84857624b1 100644
--- a/linguistic/qa/complex/linguistic/makefile.mk
+++ b/linguistic/qa/complex/linguistic/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.24.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/linguistic/qa/unoapi/makefile.mk b/linguistic/qa/unoapi/makefile.mk
index 8bac81ca33..f2f5e4bb0d 100644
--- a/linguistic/qa/unoapi/makefile.mk
+++ b/linguistic/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 8a544d0450..ae0f9fb8e9 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: convdic.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 649262ab39..c0a22da8a1 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: convdic.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 1d5729b34b..665333a662 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: convdiclist.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 65021041d6..bbc7a0b64e 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: convdiclist.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 772666a90c..cb98a8e82b 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: convdicxml.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index ab1deee005..5e25a117c0 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: convdicxml.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 7068faae25..3ba559caa1 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defs.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index e894e7e80c..475a290540 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dicimp.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index ab60c94f97..8086fd8cfa 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dicimp.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 0436504c2b..391976ee6b 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlistimp.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 2ef1544629..4f067c634a 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlistimp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 94caf22eec..5adbc441ff 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.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: gciterator.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/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 6697b8e704..6b16f4b976 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.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: gciterator.hxx,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/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 9cac236ea0..9956f09c92 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grammarchecker.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx
index b812c62177..89709a68b9 100644
--- a/linguistic/source/grammarchecker.hxx
+++ b/linguistic/source/grammarchecker.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grammarchecker.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index abd8879dbc..fe4d0ea613 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hhconvdic.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index e09d3e513d..9bdecf0903 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hhconvdic.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 3922e9f04d..99226adb66 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -1,14 +1,10 @@
-
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphdsp.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 364244a3a0..7de31dc010 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphdsp.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 34ea7299a9..cf4325d991 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphdta.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index f5d050b30a..d47e6dd1cc 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iprcache.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index fc6f4c7cc3..e3d593a05f 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngopt.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 2188ef4d88..1355baa3af 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngopt.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index c233fdcff2..feb756d339 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prophelp.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index 6bf6f2021f..9411c52469 100644
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngreg.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 2a70e9eeb1..8a5bb9d216 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngsvcmgr.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 1c96adea46..5688dc6ff2 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngsvcmgr.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 0012a9acd1..ad1a816c76 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.26 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 2df19215fd..69995dcc4c 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: misc.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index 297366322f..ae2fa76882 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: misc2.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 6f0682e3b8..6e6d3a4ca4 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spelldsp.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 53e5be5d17..e1f0e1c148 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spelldsp.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 5004e84f46..66fc739d8a 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spelldta.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/staticmb.cxx b/linguistic/source/staticmb.cxx
index a554ceda99..8b2b6bc1a3 100644
--- a/linguistic/source/staticmb.cxx
+++ b/linguistic/source/staticmb.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: staticmb.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 3f3e7eddec..a4ec545dc3 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdsp.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index baa3756b13..c6a4d75d7f 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdsp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index c196942404..a6ee07166a 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdta.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
index fcabbe9422..e913106a95 100644
--- a/linguistic/workben/makefile.mk
+++ b/linguistic/workben/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 5fe9f29cf4..4970f28d4e 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sprophelp.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx
index 6322e5a50a..c7be40fc3c 100644
--- a/linguistic/workben/sprophelp.hxx
+++ b/linguistic/workben/sprophelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sprophelp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index 8328dd4143..2627878aaf 100644
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sreg.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 8cc3bfd8c1..807d984f27 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sspellimp.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index df866183ba..6dd06288ed 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sspellimp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
index e8813146c4..4829c2eeb3 100644
--- a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FirstStartWizard.xcu,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu
index 89e2a8477b..d5c6fa337e 100644
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Inet.xcu,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/LDAP.xcu.sample b/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
index b59cd7d5fe..7e89027e69 100644
--- a/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
+++ b/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDAP.xcu.sample,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl b/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
index d99095d8fa..fbc0ca759a 100644
--- a/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
+++ b/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Langpack.xcu.tmpl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index a138a4218c..ed334a726d 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -3,13 +3,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: Common.xcu,v $
- * $Revision: 1.52 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index e37612a049..aa0159fc5c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Calc.xcu,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index cd8c0c83dc..1a98a05d24 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -3,13 +3,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: Common.xcu,v $
- * $Revision: 1.52 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
index ac5efe1d31..792db5fe0c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Compatibility.xcu,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index a426891272..7b8df46c80 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 757876c94c..a73a53e82e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Embedding.xcu,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index 96de4c65a3..071adbc573 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ExtensionManager.xcu,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu b/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu
index 129ff2a1dd..bf6e6e4097 100755..100644
--- a/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FormWizard.xcu,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Histories.xcu b/officecfg/registry/data/org/openoffice/Office/Histories.xcu
index f3983ce448..6c7dab6927 100644
--- a/officecfg/registry/data/org/openoffice/Office/Histories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Histories.xcu
@@ -1,36 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: Histories.xcu,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: as $ $Date: 2008/03/20 09:22:37 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 2a2dd0fb35..05aea81710 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Impress.xcu,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
index 6a1fe6a654..cc7dbaf84c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Jobs.xcu,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Labels.xcu b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
index 4037c00908..232898d740 100644
--- a/officecfg/registry/data/org/openoffice/Office/Labels.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Labels.xcu,v $
- * $Revision: 1.9.112.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu b/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
index a4e8b48031..ce2c81347c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Linguistic.xcu,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Logging.xcu b/officecfg/registry/data/org/openoffice/Office/Logging.xcu
index f15cf830a8..13cf7a3cf2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Logging.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Logging.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Logging.xcu,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Math.xcu b/officecfg/registry/data/org/openoffice/Office/Math.xcu
index abfe2a48f8..cf11e57568 100644
--- a/officecfg/registry/data/org/openoffice/Office/Math.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Math.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Math.xcu,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 06fc5bdcef..c7948714e7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Paths.xcu,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index a6efdca81f..8ef8fcd259 100644
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProtocolHandler.xcu,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/SFX.xcu b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
index 2a185f707a..5a576588c9 100644
--- a/officecfg/registry/data/org/openoffice/Office/SFX.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SFX.xcu,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
index 0c7b9a52e4..f80a986f39 100644
--- a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Scripting.xcu,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Security.xcu b/officecfg/registry/data/org/openoffice/Office/Security.xcu
index 40c5f32433..385983a56c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Security.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Security.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Security.xcu,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu b/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
index c78486f75d..97f49fa8b3 100644
--- a/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TableWizard.xcu,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
index dee2c35616..77308042da 100644
--- a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TypeDetection.xcu,v $
- * $Revision: 1.50 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 55104521ff..2e59e78bd7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UI.xcu,v $
- * $Revision: 1.38.90.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index a0e225ec2e..e8e2fac513 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BasicIDEWindowState.xcu,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 4cf86e66c2..cf2ab44d31 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CalcWindowState.xcu,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
index 23f1c338bc..b45f5d6597 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartWindowState.xcu,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 46a68a088c..f6f87fbfe3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Controller.xcu,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 0e029adec7..5373bf31b1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DrawWindowState.xcu,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index f609501573..6d000b080e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Effects.xcu,v $
- * $Revision: 1.9.74.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index 0884a72d84..83554a37d0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Factories.xcu,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
index 350d7bd493..4d3e4b2582 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GenericCategories.xcu,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fa69145371..a252975463 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3,13 +3,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: GenericCommands.xcu,v $
- * $Revision: 1.72.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index d8c92a59de..079855def6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ImpressWindowState.xcu,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
index 398c22e394..2055eb55ab 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MathWindowState.xcu,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
index ffffbd94fd..25b8bc1208 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
@@ -3,13 +3,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: StartModuleCommands.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
index eb08ac6444..35440057e7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StartModuleWindowState.xcu,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index 2a15526000..6ae9914427 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterFormWindowState.xcu,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index aeb443e3eb..870e3c5c52 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterGlobalWindowState.xcu,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index c5a6cbca1c..78fa9693d2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterReportWindowState.xcu,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 93433e6efe..8c0eccc927 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterWebWindowState.xcu,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 12cc7a9de0..60417cae30 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterWindowState.xcu,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 202ec117d8..f78926234b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsWindowState.xcu,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index 2393152ea0..3032350e5a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.18 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index 9cff446871..007da74b6a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Views.xcu,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
index b3566f11d3..31741d0ddf 100644
--- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WebWizard.xcu,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index e3eedf230e..8b15cf8729 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Writer.xcu,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 50b67954ae..f8fd37a5cd 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.19.112.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 3ed8e9e89b..170459c322 100755
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -3,13 +3,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: Setup.xcu,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
index 7d5956d72f..e93450a7d0 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UISort.xcu,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
index 80f1a89bec..58e8825553 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/data/org/openoffice/UserProfile.xcu b/officecfg/registry/data/org/openoffice/UserProfile.xcu
index f94a294f7f..ac5e5673ad 100644
--- a/officecfg/registry/data/org/openoffice/UserProfile.xcu
+++ b/officecfg/registry/data/org/openoffice/UserProfile.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UserProfile.xcu,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index c07b477934..eb5b092031 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -2,8 +2,8 @@
 <!--***********************************************************************
  *
  * 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
  *
diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
index 6d5a1b264d..f2d8d02f28 100755
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index 988a4755af..df824b593a 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Configuration.xcu,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/data/org/openoffice/ucb/makefile.mk b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
index 0ae3a5547f..176e542250 100644
--- a/officecfg/registry/data/org/openoffice/ucb/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/makefile.mk b/officecfg/registry/makefile.mk
index f42752fe94..2eb5043465 100644
--- a/officecfg/registry/makefile.mk
+++ b/officecfg/registry/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/makefile.mk b/officecfg/registry/schema/makefile.mk
index e36776d7d5..f17b052d71 100644
--- a/officecfg/registry/schema/makefile.mk
+++ b/officecfg/registry/schema/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.23 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
index bfbe4a4b24..4029fbd7dd 100644
--- a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FirstStartWizard.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs b/officecfg/registry/schema/org/openoffice/Inet.xcs
index 2d4e9246cd..0d110653bb 100644
--- a/officecfg/registry/schema/org/openoffice/Inet.xcs
+++ b/officecfg/registry/schema/org/openoffice/Inet.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Inet.xcs,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/LDAP.xcs b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index ef851d0f22..1d1c31bf74 100644
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LDAP.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs b/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
index c8472ce6e9..3080026de2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
@@ -1,89 +1,81 @@
-<?xml version="1.0"?>

-<!--***********************************************************************

- *

- *  OpenOffice.org - a multi-platform office productivity suite

- *

- *  $RCSfile: Accelerators.xcs,v $

- *

- *  $Revision: 1.1.2.6 $

- *

- *  last change: $Author: wuy $ $Date: 2008/08/06 08:13:26 $

- *

- *  The Contents of this file are made available subject to

- *  the terms of GNU Lesser General Public License Version 2.1.

- *

- *

- *    GNU Lesser General Public License Version 2.1

- *    =============================================

- *    Copyright 2005 by Sun Microsystems, Inc.

- *    901 San Antonio Road, Palo Alto, CA 94303, USA

- *

- *    This library is free software; you can redistribute it and/or

- *    modify it under the terms of the GNU Lesser General Public

- *    License version 2.1, as published by the Free Software Foundation.

- *

- *    This library is distributed in the hope that it will be useful,

- *    but WITHOUT ANY WARRANTY; without even the implied warranty of

- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- *    Lesser General Public License for more details.

- *

- *    You should have received a copy of the GNU Lesser General Public

- *    License along with this library; if not, write to the Free Software

- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,

- *    MA  02111-1307  USA

- *

- ************************************************************************ -->

-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Accelerators" oor:package="org.openoffice.Office" xml:lang="en-US">

-    <info>

-        <desc>Configuration of Accelerators replacing the old not XCU-based configuration</desc>

-    </info>

-	<templates>

-		<group oor:name="Key">		

-            <info>

-                <desc>document the Key format</desc>

-            </info>	

-            <prop oor:name="Command" oor:type="xs:string" oor:localized="true">

-				<info>

-					<desc>e.g..uno:About</desc>

-				</info>

-            </prop>	

-		</group>

-		<set oor:name="Module" oor:node-type="Key">

-            <info>

-                <desc>point to a module of OOo</desc>

-            </info>		

-		</set>

-	</templates>

-	<component>

-	    <group oor:name="PrimaryKeys">

-	        <info>

-	            <desc>contains the preferred keys</desc>

-	        </info>

-	        <set oor:name="Global" oor:node-type="Key">

-	            <info>

-				    <desc>Defined as key-values pairs</desc>

-	            </info>

-	        </set>

-	        <set oor:name="Modules" oor:node-type="Module">

-	            <info>

-				    <desc>containing the modules of OOo, defined as key-values pairs</desc>

-	            </info>

-	        </set>	        

-	    </group>

-	    <group oor:name="SecondaryKeys">

-	        <info>

-	            <desc>contains the secondary keys</desc>

-	        </info>

-	        <set oor:name="Global" oor:node-type="Key">

-	            <info>

-				    <desc>Defined as key-values pairs</desc>

-	            </info>

-	        </set>

-	        <set oor:name="Modules" oor:node-type="Module">

-	            <info>

-				    <desc>containing the modules of OOo, defined as key-values pairs</desc>

-	            </info>

-	        </set>	        

-	    </group>	    

-	</component>

-</oor:component-schema>

+<?xml version="1.0"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Accelerators" oor:package="org.openoffice.Office" xml:lang="en-US">
+    <info>
+        <desc>Configuration of Accelerators replacing the old not XCU-based configuration</desc>
+    </info>
+	<templates>
+		<group oor:name="Key">		
+            <info>
+                <desc>document the Key format</desc>
+            </info>	
+            <prop oor:name="Command" oor:type="xs:string" oor:localized="true">
+				<info>
+					<desc>e.g..uno:About</desc>
+				</info>
+            </prop>	
+		</group>
+		<set oor:name="Module" oor:node-type="Key">
+            <info>
+                <desc>point to a module of OOo</desc>
+            </info>		
+		</set>
+	</templates>
+	<component>
+	    <group oor:name="PrimaryKeys">
+	        <info>
+	            <desc>contains the preferred keys</desc>
+	        </info>
+	        <set oor:name="Global" oor:node-type="Key">
+	            <info>
+				    <desc>Defined as key-values pairs</desc>
+	            </info>
+	        </set>
+	        <set oor:name="Modules" oor:node-type="Module">
+	            <info>
+				    <desc>containing the modules of OOo, defined as key-values pairs</desc>
+	            </info>
+	        </set>	        
+	    </group>
+	    <group oor:name="SecondaryKeys">
+	        <info>
+	            <desc>contains the secondary keys</desc>
+	        </info>
+	        <set oor:name="Global" oor:node-type="Key">
+	            <info>
+				    <desc>Defined as key-values pairs</desc>
+	            </info>
+	        </set>
+	        <set oor:name="Modules" oor:node-type="Module">
+	            <info>
+				    <desc>containing the modules of OOo, defined as key-values pairs</desc>
+	            </info>
+	        </set>	        
+	    </group>	    
+	</component>
+</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
index 75a041e4e3..ebe2207df3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Addons.xcs,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 1ab6b58b4d..c558a6c37a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Calc.xcs,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs b/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
index d10d2f5067..2f6dde11ce 100644
--- a/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CalcAddIns.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
index 5680a89f8a..06b8fdda74 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Chart.xcs,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
index 7b77b8b7e0..80091107d3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Commands.xcs,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 61e3221659..a781bb5b68 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Common.xcs,v $
- * $Revision: 1.156.14.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 4904dc2e86..d0786fee2e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Compatibility.xcs,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index cb684017c7..0689abb0ad 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcs,v $
- * $Revision: 1.43 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
index d0b54e7149..c94322aee1 100755..100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DataAccess.xcs,v $
- * $Revision: 1.43 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
index 906bbe5108..4c273a5eea 100755..100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index c7e4f71c67..f0df31b48d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Draw.xcs,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
index 3e3d974513..cd481bf569 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Embedding.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Events.xcs b/officecfg/registry/schema/org/openoffice/Office/Events.xcs
index 4d7ee71a10..593690981a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Events.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Events.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Events.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
index 7105c0be5d..5a4fa9cf94 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ExtendedColorScheme.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
index 12deac11d5..feeff12071 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ExtensionManager.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs
index 7e9dc3a260..4c5765059f 100755..100644
--- a/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FormWizard.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
index 7b496838a1..0525e80ffd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
@@ -1,36 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: Histories.xcs,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.4.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: as $ $Date: 2008/03/20 09:22:37 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index bfa2e7dce4..8791461149 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Impress.xcs,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Java.xcs b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
index 588bdb36cb..cbc1ea66c3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Java.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
index 104914d12d..96879e855a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Jobs.xcs,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
index 1400d1d763..e738e119c2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Labels.xcs,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 99bee988ab..c7e5415bd2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Linguistic.xcs,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 5c2f2f1b4f..c07e3e9409 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Logging.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index d0d8ad0041..02c47f0d30 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Math.xcs,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
index 1504d979b5..c3199600b5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
index 85815e9a96..f049669c21 100644
--- a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OptionsDialog.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
index c68efa3d78..8f0e0cb3fd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Paths.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
index 566c5f70a4..aee6b80ce5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProtocolHandler.xcs,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
index b510709bb5..e6ad343bd6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Recovery.xcs,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
index bea23e5c57..30b812bf44 100644
--- a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SFX.xcs,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
index fb6f5b75b9..89dec44325 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Scripting.xcs,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Security.xcs b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
index 823280e1e0..62a3679aff 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Security.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Security.xcs,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
index f601ca5673..baecdaa7e2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Substitution.xcs,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
index 58670782df..95ee08c71f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TabBrowse.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
index 980cec077a..5fc45166ec 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TableWizard.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
index 8fbc468225..1aa70db3a1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TypeDetection.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index 48368c263b..c7e9501121 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UI.xcs,v $
- * $Revision: 1.30.126.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
index 473b05def6..f84712c81e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BaseWindowState.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
index 404296b612..34800fa831 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BasicIDECommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
index b94c23e5f3..d1dc57041e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BasicIDEWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
index bdf5ead9e5..f471a756ff 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BibliographyCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
index ce9f5d4940..126e45ac58 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BibliographyWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
index 8b49958056..7bd665fdf8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CalcCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
index 5b31badc04..3a4c335140 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CalcWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
index 9c86bfa67b..45eda7c8a2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Category.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
index a61d7fc933..eaf1e5dcca 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
index 41d0751868..5105cd354c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartWindowState.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
index 23fb895254..f2e9104f8b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Commands.xcs,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
index c36bafc9db..e109a6cb30 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Controller.xcs,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
index 96a17dbf54..253d642ab8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbBrowserWindowState.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
index 339daf19f5..d3b6f4e2bc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbQueryWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
index 718de0125e..dd23c3718a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbRelationWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
index 05e8ccc7ce..5756df7c87 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbTableDataWindowState.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
index 289972eb29..472ec16153 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbTableWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
index 01ad1b82dd..2317637d75 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DbuCommands.xcs,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
index 3212fe4096..00c1bfb966 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DrawImpressCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
index c764bbf344..cd2cf0a251 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DrawWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
index 90c9a9885f..5abe47807d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Effects.xcs,v $
- * $Revision: 1.7.74.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
index 3475cbacc1..622718c3d2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Factories.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
index 31de64f2c1..103d53b397 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GenericCategories.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
index 039daffdce..b5b219b26c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GenericCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
index 9faaecb096..a70b66e7c0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GlobalSettings.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
index 3a70589dac..dbdedf2adf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ImpressWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
index 9de5501f8f..4f908931fc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MathCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
index 0e14c3360f..a5e0f0e2e2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MathWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
index e76dfd3905..cb82e5ba36 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StartModuleCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
index e04b9ab2d3..f87549cf64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StartModuleWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
index 8343678f13..e923a357db 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Factories.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
index 96bd9b23dc..41e5a6a4c7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WindowState.xcs,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
index 20328cc99a..7343b95c9a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterCommands.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
index 7051df46da..849c2082d7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterFormWindowState.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
index cb11531af5..93b614e016 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterGlobalWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
index 991b3a13b5..49c5c463e2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterReportWindowState.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
index 2d7633265f..94cda8fc08 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterWebWindowState.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
index db7281c0c1..9f3aab4e8f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterWindowState.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
index fb3e7272a3..6915e17bf8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsWindowState.xcs,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
index cd4518bf19..02fe458a7f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/Office/Views.xcs b/officecfg/registry/schema/org/openoffice/Office/Views.xcs
index 9f0904903a..bee36083a5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Views.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Views.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Views.xcs,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
index c92b63c103..7245b15408 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WebWizard.xcs,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index cb22883eba..9fd9559477 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Writer.xcs,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index ebb9fca309..4f16b3b198 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterWeb.xcs,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
index 320ec8eed2..add65a0374 100644
--- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.18.112.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 21ee286df7..ab0ccec41d 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Setup.xcs,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/System.xcs b/officecfg/registry/schema/org/openoffice/System.xcs
index f0cd6618b5..0180ccbe4e 100644
--- a/officecfg/registry/schema/org/openoffice/System.xcs
+++ b/officecfg/registry/schema/org/openoffice/System.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: System.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
index 34a6f02e44..82b898e79b 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Filter.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
index 4f10574193..4d0340fe4a 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GraphicFilter.xcs,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
index 8e7751f01b..068ce1f83b 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Misc.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
index ed690648dc..f493664f3a 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Types.xcs,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
index a943bae5c5..e2171a3a2e 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UISort.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
index e22c7c6f7a..bb7e99d5db 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/UserProfile.xcs b/officecfg/registry/schema/org/openoffice/UserProfile.xcs
index e76d4ec7b5..0ca552e259 100644
--- a/officecfg/registry/schema/org/openoffice/UserProfile.xcs
+++ b/officecfg/registry/schema/org/openoffice/UserProfile.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UserProfile.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs b/officecfg/registry/schema/org/openoffice/VCL.xcs
index eadca0a141..9fe538e8ad 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VCL.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/makefile.mk b/officecfg/registry/schema/org/openoffice/makefile.mk
index 2269c68b00..c5f1f9afff 100644
--- a/officecfg/registry/schema/org/openoffice/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
index 2b497e218a..c53daed31b 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Configuration.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs b/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
index a64ec04607..2bc8705058 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Hierarchy.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
index 6cf0a994c8..794a8ed6b5 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Configuration.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Store.xcs b/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
index 0041ee0ca2..e549cf2a61 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Store.xcs,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/officecfg/registry/schema/org/openoffice/ucb/makefile.mk b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
index 269bdded29..87e6042be6 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index fd03d973cf..b26cc1736e 100644
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
@@ -2,32 +2,28 @@
 <!--***********************************************************************
  *
   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: alllang.xsl,v $
- 
-  $Revision: 1.14 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
diff --git a/officecfg/util/component-conf.gen b/officecfg/util/component-conf.gen
index a82dded02d..5068528939 100644
--- a/officecfg/util/component-conf.gen
+++ b/officecfg/util/component-conf.gen
@@ -2,14 +2,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: component-conf.gen,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/util/component-ldif.gen b/officecfg/util/component-ldif.gen
index f1099674d1..72d252c341 100644
--- a/officecfg/util/component-ldif.gen
+++ b/officecfg/util/component-ldif.gen
@@ -2,14 +2,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: component-ldif.gen,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/util/component-map.gen b/officecfg/util/component-map.gen
index e58b90eb69..12aefb172c 100644
--- a/officecfg/util/component-map.gen
+++ b/officecfg/util/component-map.gen
@@ -2,14 +2,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: component-map.gen,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl
index bdf7c1ba25..d4924c7291 100644
--- a/officecfg/util/data_val.xsl
+++ b/officecfg/util/data_val.xsl
@@ -2,32 +2,28 @@
 <!--***********************************************************************
  *
   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: data_val.xsl,v $
- 
-  $Revision: 1.10 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <!-- ************************************************************************************** -->
diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
index d022c92537..843f97bc57 100644
--- a/officecfg/util/makefile.mk
+++ b/officecfg/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/util/makefile.pmk b/officecfg/util/makefile.pmk
index aa6bcb6548..8b845649bc 100644
--- a/officecfg/util/makefile.pmk
+++ b/officecfg/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.36 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/officecfg/util/resource.xsl b/officecfg/util/resource.xsl
index 3343808fb4..49af5f01ee 100644
--- a/officecfg/util/resource.xsl
+++ b/officecfg/util/resource.xsl
@@ -2,32 +2,28 @@
 <!--***********************************************************************
  *
   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: resource.xsl,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl
index f7379d13f1..4271304916 100644
--- a/officecfg/util/schema_trim.xsl
+++ b/officecfg/util/schema_trim.xsl
@@ -2,32 +2,28 @@
 <!--***********************************************************************
  *
   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: schema_trim.xsl,v $
- 
-  $Revision: 1.10 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/officecfg/util/schema_val.xsl b/officecfg/util/schema_val.xsl
index 09655938d8..8f0334a4e0 100644
--- a/officecfg/util/schema_val.xsl
+++ b/officecfg/util/schema_val.xsl
@@ -2,32 +2,28 @@
 <!--***********************************************************************
  *
   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: schema_val.xsl,v $
- 
-  $Revision: 1.11 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/oovbaapi/genconstidl/ApiSymbols.dtd b/oovbaapi/genconstidl/ApiSymbols.dtd
index 596d27dcf6..220b2e29ed 100644
--- a/oovbaapi/genconstidl/ApiSymbols.dtd
+++ b/oovbaapi/genconstidl/ApiSymbols.dtd
@@ -1,32 +1,28 @@
 <!-- =====================================================================
 
   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: ApiSymbols.dtd,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!ELEMENT api (element)+>
diff --git a/oovbaapi/genconstidl/access.api b/oovbaapi/genconstidl/access.api
index 07de65e57d..025f0ff9b0 100644
--- a/oovbaapi/genconstidl/access.api
+++ b/oovbaapi/genconstidl/access.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: access.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/adodb.api b/oovbaapi/genconstidl/adodb.api
index 35dfff8a3c..cc529abadd 100644
--- a/oovbaapi/genconstidl/adodb.api
+++ b/oovbaapi/genconstidl/adodb.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: adodb.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/api-to-idl.pl b/oovbaapi/genconstidl/api-to-idl.pl
index ac7498ca7b..4347cab7f7 100644
--- a/oovbaapi/genconstidl/api-to-idl.pl
+++ b/oovbaapi/genconstidl/api-to-idl.pl
@@ -4,14 +4,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: api-to-idl.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/genconstidl/dao.api b/oovbaapi/genconstidl/dao.api
index 40f857fa51..fcdb539888 100644
--- a/oovbaapi/genconstidl/dao.api
+++ b/oovbaapi/genconstidl/dao.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: dao.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/excel.api b/oovbaapi/genconstidl/excel.api
index 55aa629197..59e2a0b6f8 100644
--- a/oovbaapi/genconstidl/excel.api
+++ b/oovbaapi/genconstidl/excel.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: excel.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/makefile.mk b/oovbaapi/genconstidl/makefile.mk
index 95363d56c3..c310a36155 100644
--- a/oovbaapi/genconstidl/makefile.mk
+++ b/oovbaapi/genconstidl/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/genconstidl/msforms.api b/oovbaapi/genconstidl/msforms.api
index 5b98a29ff1..9f96848eb5 100644
--- a/oovbaapi/genconstidl/msforms.api
+++ b/oovbaapi/genconstidl/msforms.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: msforms.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/oovbaconsts.xsl b/oovbaapi/genconstidl/oovbaconsts.xsl
index e4bfc61d40..643ffc7a33 100644
--- a/oovbaapi/genconstidl/oovbaconsts.xsl
+++ b/oovbaapi/genconstidl/oovbaconsts.xsl
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: oovbaconsts.xsl,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/oovbaapi/genconstidl/powerpoint.api b/oovbaapi/genconstidl/powerpoint.api
index d041313f08..b39efcb557 100644
--- a/oovbaapi/genconstidl/powerpoint.api
+++ b/oovbaapi/genconstidl/powerpoint.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: powerpoint.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/stdole.api b/oovbaapi/genconstidl/stdole.api
index 3c871e1107..314dc464f6 100644
--- a/oovbaapi/genconstidl/stdole.api
+++ b/oovbaapi/genconstidl/stdole.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: stdole.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/vba.api b/oovbaapi/genconstidl/vba.api
index cdbd78ac9f..31ac09536b 100644
--- a/oovbaapi/genconstidl/vba.api
+++ b/oovbaapi/genconstidl/vba.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: vba.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/word.api b/oovbaapi/genconstidl/word.api
index d9c18cd823..4b84a8ef5c 100644
--- a/oovbaapi/genconstidl/word.api
+++ b/oovbaapi/genconstidl/word.api
@@ -2,32 +2,28 @@
 <!-- =====================================================================
 
   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: word.api,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/ooo/vba/Globals.idl b/oovbaapi/ooo/vba/Globals.idl
index 21863c3b10..a392800580 100644
--- a/oovbaapi/ooo/vba/Globals.idl
+++ b/oovbaapi/ooo/vba/Globals.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Globals.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/XAssistant.idl b/oovbaapi/ooo/vba/XAssistant.idl
index 8ca89d0c80..bdb77732f4 100644
--- a/oovbaapi/ooo/vba/XAssistant.idl
+++ b/oovbaapi/ooo/vba/XAssistant.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XAssistant_idl__
diff --git a/oovbaapi/ooo/vba/XCollection.idl b/oovbaapi/ooo/vba/XCollection.idl
index 48949471b3..2cc6bb7261 100644
--- a/oovbaapi/ooo/vba/XCollection.idl
+++ b/oovbaapi/ooo/vba/XCollection.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XCollection.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/XCommandBar.idl b/oovbaapi/ooo/vba/XCommandBar.idl
index 59fa285ae1..33df7a46bc 100644
--- a/oovbaapi/ooo/vba/XCommandBar.idl
+++ b/oovbaapi/ooo/vba/XCommandBar.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBar_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl
index 02cf8bafc8..33222a2860 100644
--- a/oovbaapi/ooo/vba/XCommandBarControl.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControl.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBarControl_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBarControls.idl b/oovbaapi/ooo/vba/XCommandBarControls.idl
index 5495432739..bb835d4a0b 100644
--- a/oovbaapi/ooo/vba/XCommandBarControls.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControls.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBarControls_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBars.idl b/oovbaapi/ooo/vba/XCommandBars.idl
index 42e78a53ca..5d4cffb658 100644
--- a/oovbaapi/ooo/vba/XCommandBars.idl
+++ b/oovbaapi/ooo/vba/XCommandBars.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBars_idl__
diff --git a/oovbaapi/ooo/vba/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index dc9e3ab4c8..c62a67a339 100644
--- a/oovbaapi/ooo/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XErrObject.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/XGlobals.idl b/oovbaapi/ooo/vba/XGlobals.idl
index 6758d108cb..ff20861a66 100644
--- a/oovbaapi/ooo/vba/XGlobals.idl
+++ b/oovbaapi/ooo/vba/XGlobals.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XGlobals.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/XHelperInterface.idl b/oovbaapi/ooo/vba/XHelperInterface.idl
index a669ae5529..da14a5697a 100644
--- a/oovbaapi/ooo/vba/XHelperInterface.idl
+++ b/oovbaapi/ooo/vba/XHelperInterface.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XHelperInterface.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/XPropValue.idl b/oovbaapi/ooo/vba/XPropValue.idl
index dd57eb2a26..072cbfb0b1 100644
--- a/oovbaapi/ooo/vba/XPropValue.idl
+++ b/oovbaapi/ooo/vba/XPropValue.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPropValue.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
index 4a1bca88a3..50ab603e18 100644
--- a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
+++ b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XVBAToOOEventDescGen.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index fa9cdaddc1..c673bb681e 100644
--- a/oovbaapi/ooo/vba/constants/makefile.mk
+++ b/oovbaapi/ooo/vba/constants/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/ooo/vba/excel/Hyperlink.idl b/oovbaapi/ooo/vba/excel/Hyperlink.idl
index 7f2058a6c3..cdc058e4c7 100644
--- a/oovbaapi/ooo/vba/excel/Hyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/Hyperlink.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/excel/Range.idl b/oovbaapi/ooo/vba/excel/Range.idl
index 89891d6ee3..854f5ff587 100644
--- a/oovbaapi/ooo/vba/excel/Range.idl
+++ b/oovbaapi/ooo/vba/excel/Range.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Range.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/Window.idl b/oovbaapi/ooo/vba/excel/Window.idl
index ac907156fa..b367b8e900 100644
--- a/oovbaapi/ooo/vba/excel/Window.idl
+++ b/oovbaapi/ooo/vba/excel/Window.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/excel/Workbook.idl b/oovbaapi/ooo/vba/excel/Workbook.idl
index 6aa4fb353c..deb2f36cfd 100644
--- a/oovbaapi/ooo/vba/excel/Workbook.idl
+++ b/oovbaapi/ooo/vba/excel/Workbook.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Workbook.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/Worksheet.idl b/oovbaapi/ooo/vba/excel/Worksheet.idl
index 303d302ead..f288d6395d 100644
--- a/oovbaapi/ooo/vba/excel/Worksheet.idl
+++ b/oovbaapi/ooo/vba/excel/Worksheet.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Worksheet.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index be0cf98087..f39b5dfe77 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XApplication.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XAxes.idl b/oovbaapi/ooo/vba/excel/XAxes.idl
index 220f5f050f..9dfe90b812 100644
--- a/oovbaapi/ooo/vba/excel/XAxes.idl
+++ b/oovbaapi/ooo/vba/excel/XAxes.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XAxes.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index 1b79ff4ba3..7aa31cbd5c 100644
--- a/oovbaapi/ooo/vba/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XAxis.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XAxisTitle.idl b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
index 48fd559b47..1ecc89c111 100644
--- a/oovbaapi/ooo/vba/excel/XAxisTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XAxisTitle.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XBorder.idl b/oovbaapi/ooo/vba/excel/XBorder.idl
index 86e7e98978..2888f60d50 100644
--- a/oovbaapi/ooo/vba/excel/XBorder.idl
+++ b/oovbaapi/ooo/vba/excel/XBorder.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XBorder.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XBorders.idl b/oovbaapi/ooo/vba/excel/XBorders.idl
index f90e11bd05..9363c22278 100644
--- a/oovbaapi/ooo/vba/excel/XBorders.idl
+++ b/oovbaapi/ooo/vba/excel/XBorders.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XBorders.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XCharacters.idl b/oovbaapi/ooo/vba/excel/XCharacters.idl
index 29ce05a01b..1889a83be8 100644
--- a/oovbaapi/ooo/vba/excel/XCharacters.idl
+++ b/oovbaapi/ooo/vba/excel/XCharacters.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XCharacters.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XChart.idl b/oovbaapi/ooo/vba/excel/XChart.idl
index 055e939239..c7d05e1084 100644
--- a/oovbaapi/ooo/vba/excel/XChart.idl
+++ b/oovbaapi/ooo/vba/excel/XChart.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XChart.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XChartObject.idl b/oovbaapi/ooo/vba/excel/XChartObject.idl
index 335d41198c..7520cea1ab 100644
--- a/oovbaapi/ooo/vba/excel/XChartObject.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObject.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XChartObject.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XChartObjects.idl b/oovbaapi/ooo/vba/excel/XChartObjects.idl
index e5cb4e3252..0f5a0b78b7 100644
--- a/oovbaapi/ooo/vba/excel/XChartObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObjects.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XChartObjects.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XChartTitle.idl b/oovbaapi/ooo/vba/excel/XChartTitle.idl
index 69b03b3125..de1854c385 100644
--- a/oovbaapi/ooo/vba/excel/XChartTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XChartTitle.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XChartTitle.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XCharts.idl b/oovbaapi/ooo/vba/excel/XCharts.idl
index 129adad6b4..a7c9374970 100644
--- a/oovbaapi/ooo/vba/excel/XCharts.idl
+++ b/oovbaapi/ooo/vba/excel/XCharts.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XCharts.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XComment.idl b/oovbaapi/ooo/vba/excel/XComment.idl
index 0a9e926a09..19148922cf 100644
--- a/oovbaapi/ooo/vba/excel/XComment.idl
+++ b/oovbaapi/ooo/vba/excel/XComment.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XComment.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XComments.idl b/oovbaapi/ooo/vba/excel/XComments.idl
index 641b63d97e..fbd8b5ba1b 100644
--- a/oovbaapi/ooo/vba/excel/XComments.idl
+++ b/oovbaapi/ooo/vba/excel/XComments.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XComments.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XDataLabel.idl b/oovbaapi/ooo/vba/excel/XDataLabel.idl
index 5d1a0cd020..533b354cbf 100644
--- a/oovbaapi/ooo/vba/excel/XDataLabel.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabel.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XDataLabel.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XDataLabels.idl b/oovbaapi/ooo/vba/excel/XDataLabels.idl
index 91dfcefea0..6f1ce3307f 100644
--- a/oovbaapi/ooo/vba/excel/XDataLabels.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabels.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XDataLabels.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl
index 1aec6eaab5..3fef0da0bd 100644
--- a/oovbaapi/ooo/vba/excel/XDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XDialog.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XDialog.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl
index f6ce44ed35..47c66ba34c 100644
--- a/oovbaapi/ooo/vba/excel/XDialogs.idl
+++ b/oovbaapi/ooo/vba/excel/XDialogs.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XDialogs.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl
index 3a96e58033..7057bba31f 100644
--- a/oovbaapi/ooo/vba/excel/XFont.idl
+++ b/oovbaapi/ooo/vba/excel/XFont.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFont.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 4dd52ca158..fb741cd58e 100644
--- a/oovbaapi/ooo/vba/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormat.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XFormatCondition.idl b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
index ff68906f32..52b07768d5 100644
--- a/oovbaapi/ooo/vba/excel/XFormatCondition.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormatCondition.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XFormatConditions.idl b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
index 8bf32f2e1f..1a69386a3b 100644
--- a/oovbaapi/ooo/vba/excel/XFormatConditions.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormatConditions.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreak.idl b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
index 62c8cda9af..59a045f4ec 100644
--- a/oovbaapi/ooo/vba/excel/XHPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
index 01f023ba41..4be3f7e965 100644
--- a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XHyperlink.idl b/oovbaapi/ooo/vba/excel/XHyperlink.idl
index b72bb0ab71..a89bd04aff 100644
--- a/oovbaapi/ooo/vba/excel/XHyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/XHyperlink.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_excel_XHyperlink_idl__
diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl
index 9386a13c41..ce36a4ddfe 100644
--- a/oovbaapi/ooo/vba/excel/XInterior.idl
+++ b/oovbaapi/ooo/vba/excel/XInterior.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XInterior.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index ea281aa029..a9ca36c7b7 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XName.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XNames.idl b/oovbaapi/ooo/vba/excel/XNames.idl
index 353fd817eb..a631e273f2 100644
--- a/oovbaapi/ooo/vba/excel/XNames.idl
+++ b/oovbaapi/ooo/vba/excel/XNames.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XNames.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index c12248eb9f..8a976d8c0c 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XOLEObject.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XOLEObjects.idl b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
index 7266ba31cc..6c4bd025b3 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XOLEObjects.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XOutline.idl b/oovbaapi/ooo/vba/excel/XOutline.idl
index ed412e8933..8e9d90c39f 100644
--- a/oovbaapi/ooo/vba/excel/XOutline.idl
+++ b/oovbaapi/ooo/vba/excel/XOutline.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XOutline.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XPageBreak.idl b/oovbaapi/ooo/vba/excel/XPageBreak.idl
index f8e12a734a..db7668bef1 100644
--- a/oovbaapi/ooo/vba/excel/XPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XPageBreak.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 03ed927338..5e8179180e 100644
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XPane.idl b/oovbaapi/ooo/vba/excel/XPane.idl
index 74635c6867..acc5520bb9 100644
--- a/oovbaapi/ooo/vba/excel/XPane.idl
+++ b/oovbaapi/ooo/vba/excel/XPane.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPane.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 9d5d8d29d4..acad424617 100644
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPivotCache.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XPivotTable.idl b/oovbaapi/ooo/vba/excel/XPivotTable.idl
index e77cc3beb7..85a8c8175d 100644
--- a/oovbaapi/ooo/vba/excel/XPivotTable.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTable.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPivotTable.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XPivotTables.idl b/oovbaapi/ooo/vba/excel/XPivotTables.idl
index 28849ef756..ce2ee2a69f 100644
--- a/oovbaapi/ooo/vba/excel/XPivotTables.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTables.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPivotTables.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 5e59bf498b..845f293370 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XRange.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XSeries.idl b/oovbaapi/ooo/vba/excel/XSeries.idl
index fc95826428..421394af7f 100644
--- a/oovbaapi/ooo/vba/excel/XSeries.idl
+++ b/oovbaapi/ooo/vba/excel/XSeries.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XSeries.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
index 429c7f3bec..915a340447 100644
--- a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
+++ b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XSeriesCollection.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XStyle.idl b/oovbaapi/ooo/vba/excel/XStyle.idl
index 542e73c3fe..205f94524d 100644
--- a/oovbaapi/ooo/vba/excel/XStyle.idl
+++ b/oovbaapi/ooo/vba/excel/XStyle.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XStyle.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XStyles.idl b/oovbaapi/ooo/vba/excel/XStyles.idl
index 69fd3bbf0a..1e3896f918 100644
--- a/oovbaapi/ooo/vba/excel/XStyles.idl
+++ b/oovbaapi/ooo/vba/excel/XStyles.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XStyles.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl
index 534b2561ea..3721d08743 100644
--- a/oovbaapi/ooo/vba/excel/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XTextFrame.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XTitle.idl b/oovbaapi/ooo/vba/excel/XTitle.idl
index 11013f298e..dcbcfc4eb5 100644
--- a/oovbaapi/ooo/vba/excel/XTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XTitle.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XTitle.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index dd1ef46202..9155b8fe9c 100644
--- a/oovbaapi/ooo/vba/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XValidation.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWindow.idl b/oovbaapi/ooo/vba/excel/XWindow.idl
index 2baf8995ab..e095fa8591 100644
--- a/oovbaapi/ooo/vba/excel/XWindow.idl
+++ b/oovbaapi/ooo/vba/excel/XWindow.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWindow.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWindows.idl b/oovbaapi/ooo/vba/excel/XWindows.idl
index 1d1d196ecd..4aed302571 100644
--- a/oovbaapi/ooo/vba/excel/XWindows.idl
+++ b/oovbaapi/ooo/vba/excel/XWindows.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWindows.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index d4d9167d78..73a7b96475 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWorkbook.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index 955e553f15..ced2739a08 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWorkbooks.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 7a00aeaf2b..4cec94a1f2 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWorksheet.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
index dba0487952..e9a6b6303c 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWorksheetFunction.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XWorksheets.idl b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index 7010ab4aa6..79e2225040 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XWorksheets.idl,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
index 38eaf83d84..7238547602 100644
--- a/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XlBuildInDialog.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
index 764c073e68..5e9f84bc9b 100644
--- a/oovbaapi/ooo/vba/excel/makefile.mk
+++ b/oovbaapi/ooo/vba/excel/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index 99a11e5ac0..9c5df80788 100644
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
index b1abcc7966..b52a1ea3d3 100644
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MSFormReturnTypes.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XButton.idl
index 5469863424..cfdd3369d3 100644
--- a/oovbaapi/ooo/vba/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XButton.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XButton.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 35ead4e0d4..0c9e1ee83a 100644
--- a/oovbaapi/ooo/vba/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XColorFormat.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 42fb76a045..1b47249965 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XComboBox.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 30901fb729..e93054f355 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XControl.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
index b6abd88384..761f7e67b4 100644
--- a/oovbaapi/ooo/vba/msforms/XControls.idl
+++ b/oovbaapi/ooo/vba/msforms/XControls.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index 8dd4afd3da..02cdc39ad2 100644
--- a/oovbaapi/ooo/vba/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFillFormat.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index 0280736fc2..fb931cc885 100644
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XGroupBox_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index 1136af6a26..1e0fb58fa5 100644
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 35e10c8258..c2f1c87759 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XLabel.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index bfa2c8fb6a..72df94ee5c 100644
--- a/oovbaapi/ooo/vba/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XLineFormat.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 2ff4d6d670..27dcf80524 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
index 98795989b1..3451fa2f78 100644
--- a/oovbaapi/ooo/vba/msforms/XMultiPage.idl
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XMultiPage_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
index 06f237646a..334c0b5ed6 100644
--- a/oovbaapi/ooo/vba/msforms/XPages.idl
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XPage_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index f6baecd5de..4eb6a2bcf7 100644
--- a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPictureFormat.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
index bf7e6a4347..95cf5f3ee8 100644
--- a/oovbaapi/ooo/vba/msforms/XProgressBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XProgressBar_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index 3821f830ee..81e4360548 100644
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XRadioButton.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
index 2566a9ef1b..8106d76604 100644
--- a/oovbaapi/ooo/vba/msforms/XScrollBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XScrollBar_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index a1ac36dd27..c4588c3698 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XShape.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 1b39485dfd..86bdbfc6f3 100644
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XShapeRange.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index 3ba31ab8a6..c5db83f047 100644
--- a/oovbaapi/ooo/vba/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XShapes.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
index b7d154baf4..708c41e422 100644
--- a/oovbaapi/ooo/vba/msforms/XSpinButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XSpinButton_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index ab877756d7..2e28f34019 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XTextBox.idl,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
index 7d2b589874..718332f81f 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XTextBoxShape_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index 4ff8fb0be3..9107564cd6 100644
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XToggleButton_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index 076db018df..421ced729b 100644
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XUserForm_idl__
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index f654993144..6060a64f2a 100644
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/util/makefile.mk b/oovbaapi/util/makefile.mk
index 9fbd349b08..4706b15638 100644
--- a/oovbaapi/util/makefile.mk
+++ b/oovbaapi/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/oovbaapi/util/makefile.pmk b/oovbaapi/util/makefile.pmk
index 9ea2da2c1e..6d5883198b 100644
--- a/oovbaapi/util/makefile.pmk
+++ b/oovbaapi/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/readlicense_oo/docs/readme/makefile.mk b/readlicense_oo/docs/readme/makefile.mk
index d55f1cbdc1..7641f67cfd 100755..100644
--- a/readlicense_oo/docs/readme/makefile.mk
+++ b/readlicense_oo/docs/readme/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/readlicense_oo/html/makefile.mk b/readlicense_oo/html/makefile.mk
index 795f912514..6513a868c1 100644
--- a/readlicense_oo/html/makefile.mk
+++ b/readlicense_oo/html/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index b5c9099a1a..a379e40051 100755..100644
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -1,12 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $RCSfile: makefile.pmk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sandbox/com/sun/star/lib/sandbox/AudioProxy.java b/sandbox/com/sun/star/lib/sandbox/AudioProxy.java
index 07a0dce1d5..4171adbbca 100644
--- a/sandbox/com/sun/star/lib/sandbox/AudioProxy.java
+++ b/sandbox/com/sun/star/lib/sandbox/AudioProxy.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AudioProxy.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/Cachable.java b/sandbox/com/sun/star/lib/sandbox/Cachable.java
index 607124c011..50b019a7f9 100644
--- a/sandbox/com/sun/star/lib/sandbox/Cachable.java
+++ b/sandbox/com/sun/star/lib/sandbox/Cachable.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Cachable.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ClassContext.java b/sandbox/com/sun/star/lib/sandbox/ClassContext.java
index 8027485eeb..ff71ceabdb 100644
--- a/sandbox/com/sun/star/lib/sandbox/ClassContext.java
+++ b/sandbox/com/sun/star/lib/sandbox/ClassContext.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ClassContext.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java b/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java
index 5eed4a85ab..77ffb60ef3 100644
--- a/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java
+++ b/sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ClassContextImpl.java,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java b/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java
index 6c90cbe899..eb2c7c7aa5 100644
--- a/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java
+++ b/sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ClassContextProxy.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/CodeSource.java b/sandbox/com/sun/star/lib/sandbox/CodeSource.java
index acbbacaa29..ef16cd2946 100644
--- a/sandbox/com/sun/star/lib/sandbox/CodeSource.java
+++ b/sandbox/com/sun/star/lib/sandbox/CodeSource.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CodeSource.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/Disposable.java b/sandbox/com/sun/star/lib/sandbox/Disposable.java
index ed06774997..c36287445e 100644
--- a/sandbox/com/sun/star/lib/sandbox/Disposable.java
+++ b/sandbox/com/sun/star/lib/sandbox/Disposable.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Disposable.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java b/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java
index a534ec2ff7..e4b154b630 100644
--- a/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java
+++ b/sandbox/com/sun/star/lib/sandbox/ExecutionContext.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ExecutionContext.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/Holder.java b/sandbox/com/sun/star/lib/sandbox/Holder.java
index d65efb856a..e37a4f6272 100644
--- a/sandbox/com/sun/star/lib/sandbox/Holder.java
+++ b/sandbox/com/sun/star/lib/sandbox/Holder.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Holder.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java b/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java
index a05abf71db..1efe15bb01 100644
--- a/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java
+++ b/sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ImageProducerProxy.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/JarEntry.java b/sandbox/com/sun/star/lib/sandbox/JarEntry.java
index 90f2584575..f78ccdef03 100644
--- a/sandbox/com/sun/star/lib/sandbox/JarEntry.java
+++ b/sandbox/com/sun/star/lib/sandbox/JarEntry.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JarEntry.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/JarInputStream.java b/sandbox/com/sun/star/lib/sandbox/JarInputStream.java
index e7d78fa7a6..71305cc1f3 100644
--- a/sandbox/com/sun/star/lib/sandbox/JarInputStream.java
+++ b/sandbox/com/sun/star/lib/sandbox/JarInputStream.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JarInputStream.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/Permission.java b/sandbox/com/sun/star/lib/sandbox/Permission.java
index a9b05e2811..e9bad1db7c 100644
--- a/sandbox/com/sun/star/lib/sandbox/Permission.java
+++ b/sandbox/com/sun/star/lib/sandbox/Permission.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Permission.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java b/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java
index 71b542d6fa..77d3727431 100644
--- a/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java
+++ b/sandbox/com/sun/star/lib/sandbox/PermissionCollection.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PermissionCollection.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java b/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java
index d5b6dd036e..cbbf7bf331 100644
--- a/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java
+++ b/sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProtectionDomain.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/Resource.java b/sandbox/com/sun/star/lib/sandbox/Resource.java
index 3228f2b2e3..075dd3447f 100644
--- a/sandbox/com/sun/star/lib/sandbox/Resource.java
+++ b/sandbox/com/sun/star/lib/sandbox/Resource.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Resource.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java b/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java
index 10a53a7296..62178436c7 100644
--- a/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java
+++ b/sandbox/com/sun/star/lib/sandbox/ResourceImpl.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResourceImpl.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java b/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java
index 1834590088..9cdefbdfb5 100644
--- a/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java
+++ b/sandbox/com/sun/star/lib/sandbox/ResourceProxy.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResourceProxy.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java b/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java
index 0df5ba8620..e31daa891d 100644
--- a/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java
+++ b/sandbox/com/sun/star/lib/sandbox/ResourceViewer.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResourceViewer.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java b/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java
index 846aa1560a..3c0b5c90f4 100644
--- a/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java
+++ b/sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SandboxMessageHandler.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java b/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java
index b05de12fa1..a39f4ff499 100644
--- a/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java
+++ b/sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SandboxSecurity.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java b/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java
index 8312dd2792..c7565ca072 100644
--- a/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java
+++ b/sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SandboxSecurityException.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java b/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java
index 18dfe58006..368dd902a0 100644
--- a/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java
+++ b/sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SandboxThreadGroup.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/WeakEntry.java b/sandbox/com/sun/star/lib/sandbox/WeakEntry.java
index 999a011fd4..b4f033e285 100644
--- a/sandbox/com/sun/star/lib/sandbox/WeakEntry.java
+++ b/sandbox/com/sun/star/lib/sandbox/WeakEntry.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WeakEntry.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/WeakRef.java b/sandbox/com/sun/star/lib/sandbox/WeakRef.java
index fe38dc07b6..cebd2e5178 100644
--- a/sandbox/com/sun/star/lib/sandbox/WeakRef.java
+++ b/sandbox/com/sun/star/lib/sandbox/WeakRef.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WeakRef.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/WeakTable.java b/sandbox/com/sun/star/lib/sandbox/WeakTable.java
index df0e379b90..8a9d9eeac8 100644
--- a/sandbox/com/sun/star/lib/sandbox/WeakTable.java
+++ b/sandbox/com/sun/star/lib/sandbox/WeakTable.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WeakTable.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/XImage.java b/sandbox/com/sun/star/lib/sandbox/XImage.java
index 3f3a7c04c8..62742654f6 100644
--- a/sandbox/com/sun/star/lib/sandbox/XImage.java
+++ b/sandbox/com/sun/star/lib/sandbox/XImage.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XImage.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/com/sun/star/lib/sandbox/makefile.mk b/sandbox/com/sun/star/lib/sandbox/makefile.mk
index 81e7fdcace..36b6c83e46 100644
--- a/sandbox/com/sun/star/lib/sandbox/makefile.mk
+++ b/sandbox/com/sun/star/lib/sandbox/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java b/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java
index 68813d6c5a..6ede16d159 100644
--- a/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java
+++ b/sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ResourceTest.java,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sandbox/test/com/sun/star/lib/sandbox/makefile.mk b/sandbox/test/com/sun/star/lib/sandbox/makefile.mk
index 1216817d4b..3e4bf65ff5 100644
--- a/sandbox/test/com/sun/star/lib/sandbox/makefile.mk
+++ b/sandbox/test/com/sun/star/lib/sandbox/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sandbox/util/makefile.mk b/sandbox/util/makefile.mk
index ac5684ec8a..de84b7b160 100644
--- a/sandbox/util/makefile.mk
+++ b/sandbox/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml
index 92e457b7fc..f6029a48c1 100755..100644
--- a/scripting/examples/java/build.xml
+++ b/scripting/examples/java/build.xml
@@ -1,32 +1,28 @@
 <!--
 
   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: build.xml,v $
- 
-  $Revision: 1.14 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <project name="Scripting Framework Java Examples" default="all" basedir=".">
   <!-- =================== Environmental Properties ======================= -->
diff --git a/scripting/examples/java/makefile.mk b/scripting/examples/java/makefile.mk
index b8138c755a..f02563afd8 100755..100644
--- a/scripting/examples/java/makefile.mk
+++ b/scripting/examples/java/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/examples/makefile.mk b/scripting/examples/makefile.mk
index f071060f02..3fd36f8b05 100755..100644
--- a/scripting/examples/makefile.mk
+++ b/scripting/examples/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/inc/makefile.mk b/scripting/inc/makefile.mk
index 86fcaf1b7f..f399662b41 100644
--- a/scripting/inc/makefile.mk
+++ b/scripting/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/inc/pch/precompiled_scripting.cxx b/scripting/inc/pch/precompiled_scripting.cxx
index e518ff1764..bb356b6fc8 100644
--- a/scripting/inc/pch/precompiled_scripting.cxx
+++ b/scripting/inc/pch/precompiled_scripting.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_scripting.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/inc/pch/precompiled_scripting.hxx b/scripting/inc/pch/precompiled_scripting.hxx
index f057e4d215..f2d1b04983 100644
--- a/scripting/inc/pch/precompiled_scripting.hxx
+++ b/scripting/inc/pch/precompiled_scripting.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_scripting.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index c3bc4541ab..a0a06e1cde 100644
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SecurityDialog.java,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/build.xml b/scripting/java/build.xml
index 985af1b87f..3216a60ceb 100755..100644
--- a/scripting/java/build.xml
+++ b/scripting/java/build.xml
@@ -1,32 +1,28 @@
 <!--
 
   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: build.xml,v $
- 
-  $Revision: 1.36.20.1 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <project name="Scipting Framework" default="all" basedir=".">
 
diff --git a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
index fb01001cb2..63dafa2141 100644
--- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
+++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DialogFactory.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 8c46eb323d..3817bb5688 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelBrowseNode.java,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index 4d9858065e..5613168323 100644
--- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PkgProviderBrowseNode.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index e88c8f26c7..2c00162097 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProviderBrowseNode.java,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index af733956d3..fc3778cf18 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptBrowseNode.java,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
index bd9a9206ab..e915a20157 100644
--- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
+++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DeployedUnoPackagesDB.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index e07e47003d..e902d62636 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Parcel.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 29fd3b6980..51a52c8d8a 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelContainer.java,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 5571fcc0c2..868357d736 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptor.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
index 0cfd4ef319..827114e8d1 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParsedScriptUri.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index 00f8f266f5..a888a73c8f 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptEntry.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 6e53f64289..04c0776d45 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptMetaData.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 4611b8e452..a450fc1da0 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoPkgContainer.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/XMLParser.java b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
index 166434e07f..5e5bd00fac 100644
--- a/scripting/java/com/sun/star/script/framework/container/XMLParser.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLParser.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
index 9bd593fb04..1a0dd4dc54 100644
--- a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLParserFactory.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index e51b872e16..d169ca0cf8 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UCBStreamHandler.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index 4481890415..28c677e991 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XInputStreamImpl.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
index 6bd802c926..c18bb9180c 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XInputStreamWrapper.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index e03c6348e2..dc2c723370 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XOutputStreamWrapper.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index 311bc0018e..4f5a2ab966 100644
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XStorageHelper.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index b2962a4fc5..4ac4b14d19 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ClassLoaderFactory.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
index df746b1605..857242ff19 100644
--- a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EditorScriptContext.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java b/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java
index fedde4715b..9b8613cf97 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java
+++ b/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NoSuitableClassLoaderException.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 75fb9a67e5..868307d507 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PathUtils.java,v $
- * $Revision: 1.8.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index ac01c7f4d0..84272f1cfe 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptContext.java,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index bc92168f09..f0c9f98760 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptProvider.java,v $
- * $Revision: 1.13.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 1a5f884476..8160d18214 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PlainSourceView.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index a177b82616..1545495721 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptEditorForBeanShell.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index cb8a350141..e5762ec1e5 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptProviderForBeanShell.java,v $
- * $Revision: 1.11.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index 60edbd0848..29295493db 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptSourceModel.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
index 6b565040dc..506f41a46c 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptSourceView.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java b/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java
index 4f88938f33..548425ca3e 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Resolver.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
index 10fb74d322..59e9952b58 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptDescriptor.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 948c711f2a..982bc152dc 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptProviderForJava.java,v $
- * $Revision: 1.10.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
index e5662d3412..6cd36c8371 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptProxy.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
index ac2c41e01b..8adb6e66e5 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StrictResolver.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 801511744d..d1813340ae 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptEditorForJavaScript.java,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index 69bec65f7e..d5e19affcf 100755..100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptProviderForJavaScript.java,v $
- * $Revision: 1.10.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
index 9b3255e6be..011b247cc1 100755..100644
--- a/scripting/java/makefile.mk
+++ b/scripting/java/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
index 5fa88ac930..29d3b704f0 100644
--- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java
+++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CommandLineTools.java,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/LocalOffice.java b/scripting/java/org/openoffice/idesupport/LocalOffice.java
index 741cbcdfe0..7687cde519 100644
--- a/scripting/java/org/openoffice/idesupport/LocalOffice.java
+++ b/scripting/java/org/openoffice/idesupport/LocalOffice.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LocalOffice.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/OfficeDocument.java b/scripting/java/org/openoffice/idesupport/OfficeDocument.java
index c6053336d3..5a7971185f 100644
--- a/scripting/java/org/openoffice/idesupport/OfficeDocument.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeDocument.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocument.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
index 0a1422e37a..66bb8a6ccf 100644
--- a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeInstallation.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index 67cc9dae0f..6543a2017a 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SVersionRCFile.java,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
index 8693e60315..55c4f24e8b 100644
--- a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AllFilesFilter.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
index a94b0408d3..d71821928d 100644
--- a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BinaryOnlyFilter.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
index ac6a136817..848ad4cd48 100644
--- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ExceptParcelFilter.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
index c3b04459f6..52ad72c475 100644
--- a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FileFilter.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
index 8c69660575..0bbf4139e0 100644
--- a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
+++ b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LocalOfficeImpl.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java b/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
index 0960b64fda..0995b138f5 100644
--- a/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConfigurePanel.java,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
index b6a09ee761..cd3514d8e9 100644
--- a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MethodPanel.java,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
index aaf78231db..48b6f57775 100644
--- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptPanel.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
index fe9f411038..84ddcbdfe1 100644
--- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java
+++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Manifest.java,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
index c7fa501ccd..5c966f4774 100644
--- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
+++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelZipper.java,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/editor/JavaKit.java b/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
index 97373f9592..a22948dc5e 100644
--- a/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
+++ b/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JavaKit.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
index 24f4c85509..d6056426ed 100644
--- a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
+++ b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NetBeansSourceView.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
index 81bd395f3a..78dc8a51c1 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BuildParcelAction.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
index 2ebd7c7686..0a831e2fe0 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CompileParcelAction.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
index d6b369fff7..32e0054987 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConfigureParcelAction.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
index 69db5710c0..7d99c51b61 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DeployParcelAction.java,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
index a2c635def4..775caf05bd 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MountDocumentAction.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
index ab2c90481b..7b07c2d098 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MountParcelAction.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
index 36bc3f77ad..f789ef5606 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentCookie.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
index d04e8673b9..6e01ae4141 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentSupport.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
index 61aa9c4a64..2ad28aaee9 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelCookie.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
index 687ed21ae6..cded0ea7bd 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorEditorSupport.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
index d90bb33a6a..66ce92b034 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorParserCookie.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
index 27095c618e..ce76bb76fb 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorParserSupport.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
index 3e357ea892..dc92ffd17c 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelFolderCookie.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
index e1e20e3654..d40b63cc70 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelFolderSupport.java,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
index 5d0f29d8de..098e26e858 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelSupport.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
index ed3b88c12d..2be0801045 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OpenOfficeDocFileSystem.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
index 88daba6998..40b2efeedf 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OpenOfficeDocFileSystemBeanInfo.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
index 350b8dcfe0..2e6574312a 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentDataLoader.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
index 11abecaf84..6db5b67760 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentDataLoaderBeanInfo.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
index d5419d5039..006147123e 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentDataNode.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
index 7ca784017b..31ef49cd1b 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentDataObject.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
index 8cd2fec77a..f409c21524 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelContentsFolder.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
index 53bbe050d2..cf3f227b68 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelContentsFolderDataLoader.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
index 52f5023a24..271543d0b7 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelContentsFolderDataLoaderBeanInfo.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
index f9cef0f545..c512b5f895 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDataLoader.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
index d6cc53b7b7..de8dce7932 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDataLoaderBeanInfo.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
index 8ae74deba4..83ebf50bcc 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDataNode.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
index 41232bf9ce..163d6e0cb6 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDataObject.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
index aef136c4d9..56becf0950 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorDataLoader.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
index 0b9480a2ee..b5d407dd69 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorDataLoaderBeanInfo.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
index f5ef51ff21..ace5c33b40 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorDataNode.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
index b4757d805f..9896518fe6 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorDataObject.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
index 0a11906625..ec6f922dfe 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelFolder.java,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
index ede3d4c0e1..d391628e72 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelFolderDataLoader.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
index 4b4de463b1..f817f23bdd 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelFolderDataLoaderBeanInfo.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
index c20faf45f1..9f80196e91 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeDocumentChildren.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
index fb38ecfe7c..e42c9966b3 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelDescriptorChildren.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
index bab06aeb29..e116af0d91 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptNode.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index 3a1bb8cb68..50ca192927 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeSettings.java,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
index 68350857bf..16c896496d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeSettingsBeanInfo.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
index 5ca772920d..a9ac1b4bda 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FrameworkJarChecker.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
index 806c83d6c2..a42ccdeba2 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ManifestParser.java,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
index 6b61bdef30..9feb6fb580 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NagDialog.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
index bd126fefc6..8cf16eb08a 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OfficeModule.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
index ae294a1df6..07c2c93937 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PackageRemover.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
index 78f698ed6a..ea0887dc8b 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ZipMounter.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
index 7550109854..a6623db5d4 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: JavaScriptIterator.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
index fd0871f242..1eaf9f827d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParcelContentsIterator.java,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index c00d18e774..8d590cbdd0 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: baslibnode.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index e42b6cd799..089133b49f 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: baslibnode.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index dae5689373..b600546f92 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmethnode.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 1ddb7c2885..8544d750ad 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmethnode.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index f9fe5a40a7..517d7c007f 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmodnode.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index ab4ab3714b..b18b11d2d4 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmodnode.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 562e60514c..24d41a3e18 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basprov.cxx,v $
- * $Revision: 1.21.6.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 9dea63dd1b..98bbbc6ab9 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basprov.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 2fedb5f7a3..687e8d0077 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basscript.cxx,v $
- * $Revision: 1.16.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 7f7db4173b..5a69863fde 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basscript.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk
index 2b6fe7faa3..9e438cecf1 100644
--- a/scripting/source/basprov/makefile.mk
+++ b/scripting/source/basprov/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 2284884e36..fe0837aa9e 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgevtatt.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index b78dad826b..d13b298755 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgevtatt.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index c22f5a9e97..d672d859ec 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgprov.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index d0a5c6bf55..120b259878 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgprov.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
index da1c88fdd6..133349194a 100644
--- a/scripting/source/dlgprov/makefile.mk
+++ b/scripting/source/dlgprov/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx
index 6d2d227e93..105db1eaf1 100644
--- a/scripting/source/inc/bcholder.hxx
+++ b/scripting/source/inc/bcholder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bcholder.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index 0f9a664dca..fcb071700b 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MiscUtils.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx
index cd4d6c83f0..39c44af80f 100644
--- a/scripting/source/inc/util/scriptingconstants.hxx
+++ b/scripting/source/inc/util/scriptingconstants.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptingconstants.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/inc/util/util.hxx b/scripting/source/inc/util/util.hxx
index ff869023b7..f3d6d81a62 100644
--- a/scripting/source/inc/util/util.hxx
+++ b/scripting/source/inc/util/util.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: util.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk
index 35440668f6..4c584e9246 100644
--- a/scripting/source/protocolhandler/makefile.mk
+++ b/scripting/source/protocolhandler/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 8a009c342b..6fdefa196e 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scripthandler.cxx,v $
- * $Revision: 1.29.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 61ba5b4002..2a2ac0ccef 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scripthandler.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 641ca09a59..f8400ed779 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ActiveMSPList.cxx,v $
- * $Revision: 1.16.16.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 26c0b166d4..175d24c031 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ActiveMSPList.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 9dd4de69bb..763b1d739d 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BrowseNodeFactoryImpl.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 95611f46a0..29a97e2f2b 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: BrowseNodeFactoryImpl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 2d3176e97f..10bf2da53d 100755..100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MasterScriptProvider.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index d8d39a6421..ed65970ecd 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MasterScriptProvider.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 851485fd42..cd1aa83da3 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MasterScriptProviderFactory.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index f3c8827fa5..16018bf13a 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MasterScriptProviderFactory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index a9473aa6f7..bae249b406 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProviderCache.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index b739ee70b1..b7c57feb70 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProviderCache.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index ba6e0f2047..f5b93a8021 100644
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptImpl.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index 9ffc7e0683..4241aba633 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptImpl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx
index 43d20b5bfe..8702710c02 100755..100644
--- a/scripting/source/provider/ScriptingContext.cxx
+++ b/scripting/source/provider/ScriptingContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptingContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
index 6b25062703..9a609e89c9 100644
--- a/scripting/source/provider/ScriptingContext.hxx
+++ b/scripting/source/provider/ScriptingContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptingContext.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 8b9e3ac9da..e601a03eed 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: URIHelper.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index 15230b2670..86f8bef1bb 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: URIHelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/provider/makefile.mk b/scripting/source/provider/makefile.mk
index 44bae77830..cae527c19c 100644
--- a/scripting/source/provider/makefile.mk
+++ b/scripting/source/provider/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index 991d82248e..dd6c1a71f7 100644
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
index 5e6bd1cd94..83278f3725 100644
--- a/scripting/source/pyprov/officehelper.py
+++ b/scripting/source/pyprov/officehelper.py
@@ -1,14 +1,10 @@
 ### *************************************************************************
 ### *
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: officehelper.py,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/runtimemgr/ScriptExecDialog.hrc b/scripting/source/runtimemgr/ScriptExecDialog.hrc
index 42c9d37492..a0da660a2b 100644
--- a/scripting/source/runtimemgr/ScriptExecDialog.hrc
+++ b/scripting/source/runtimemgr/ScriptExecDialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptExecDialog.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/ScriptExecDialog.src b/scripting/source/runtimemgr/ScriptExecDialog.src
index 319c1b950e..dbc7f7e887 100644
--- a/scripting/source/runtimemgr/ScriptExecDialog.src
+++ b/scripting/source/runtimemgr/ScriptExecDialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptExecDialog.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 6d26a2465c..6883a751e7 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptNameResolverImpl.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
index 1a60a4b4c0..ca76bdba5f 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptNameResolverImpl.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index 0aba98b504..17fb062cf2 100755..100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptRuntimeManager.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
index a628b267f3..3e07a7b93b 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptRuntimeManager.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx
index 158ce5d601..0f8549dd90 100644
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageBridge.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx
index 52d7d52782..7e9698d09f 100644
--- a/scripting/source/runtimemgr/StorageBridge.hxx
+++ b/scripting/source/runtimemgr/StorageBridge.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageBridge.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.cxx b/scripting/source/runtimemgr/StorageBridgeFactory.cxx
index 47536de3cd..d88bc66c1a 100644
--- a/scripting/source/runtimemgr/StorageBridgeFactory.cxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageBridgeFactory.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
index 80c6349d59..90b0c1138a 100644
--- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StorageBridgeFactory.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/runtimemgr/makefile.mk b/scripting/source/runtimemgr/makefile.mk
index 9c9822bf22..6edb730dda 100644
--- a/scripting/source/runtimemgr/makefile.mk
+++ b/scripting/source/runtimemgr/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/storage/ScriptData.hxx b/scripting/source/storage/ScriptData.hxx
index 104dfc4b4b..af3e3ff28c 100644
--- a/scripting/source/storage/ScriptData.hxx
+++ b/scripting/source/storage/ScriptData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptData.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptElement.cxx b/scripting/source/storage/ScriptElement.cxx
index 1efb00ca33..1287fd8f09 100644
--- a/scripting/source/storage/ScriptElement.cxx
+++ b/scripting/source/storage/ScriptElement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptElement.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptElement.hxx b/scripting/source/storage/ScriptElement.hxx
index 79c49968e5..1fcf4e1c71 100644
--- a/scripting/source/storage/ScriptElement.hxx
+++ b/scripting/source/storage/ScriptElement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptElement.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptInfo.cxx b/scripting/source/storage/ScriptInfo.cxx
index ece5c3ff92..a59728d44c 100644
--- a/scripting/source/storage/ScriptInfo.cxx
+++ b/scripting/source/storage/ScriptInfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptInfo.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptInfo.hxx b/scripting/source/storage/ScriptInfo.hxx
index 56a603b189..9aaab3a11c 100644
--- a/scripting/source/storage/ScriptInfo.hxx
+++ b/scripting/source/storage/ScriptInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptInfo.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptInfoImpl.hxx b/scripting/source/storage/ScriptInfoImpl.hxx
index c23a06ec57..35309cb48e 100644
--- a/scripting/source/storage/ScriptInfoImpl.hxx
+++ b/scripting/source/storage/ScriptInfoImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptInfoImpl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptMetadataImporter.cxx b/scripting/source/storage/ScriptMetadataImporter.cxx
index fbdb95b5c2..1ad44a0747 100644
--- a/scripting/source/storage/ScriptMetadataImporter.cxx
+++ b/scripting/source/storage/ScriptMetadataImporter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptMetadataImporter.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptMetadataImporter.hxx b/scripting/source/storage/ScriptMetadataImporter.hxx
index 04dea9caa3..9f66af9108 100644
--- a/scripting/source/storage/ScriptMetadataImporter.hxx
+++ b/scripting/source/storage/ScriptMetadataImporter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptMetadataImporter.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptSecurityManager.cxx b/scripting/source/storage/ScriptSecurityManager.cxx
index f84dbbec6d..e0e2147415 100755..100644
--- a/scripting/source/storage/ScriptSecurityManager.cxx
+++ b/scripting/source/storage/ScriptSecurityManager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptSecurityManager.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx
index 2222720459..3eacaf2b4c 100755..100644
--- a/scripting/source/storage/ScriptSecurityManager.hxx
+++ b/scripting/source/storage/ScriptSecurityManager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptSecurityManager.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptStorage.cxx b/scripting/source/storage/ScriptStorage.cxx
index 7329acc131..b5251e69ea 100644
--- a/scripting/source/storage/ScriptStorage.cxx
+++ b/scripting/source/storage/ScriptStorage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptStorage.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptStorage.hxx b/scripting/source/storage/ScriptStorage.hxx
index de49d14943..161cf8cc35 100644
--- a/scripting/source/storage/ScriptStorage.hxx
+++ b/scripting/source/storage/ScriptStorage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptStorage.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptStorageManager.cxx b/scripting/source/storage/ScriptStorageManager.cxx
index ff4b2bebe3..f0dcca0334 100644
--- a/scripting/source/storage/ScriptStorageManager.cxx
+++ b/scripting/source/storage/ScriptStorageManager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptStorageManager.cxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptStorageManager.hxx b/scripting/source/storage/ScriptStorageManager.hxx
index 13bfeae392..cfd77130a2 100644
--- a/scripting/source/storage/ScriptStorageManager.hxx
+++ b/scripting/source/storage/ScriptStorageManager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptStorageManager.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptURI.cxx b/scripting/source/storage/ScriptURI.cxx
index 3ddede9747..e883a75520 100644
--- a/scripting/source/storage/ScriptURI.cxx
+++ b/scripting/source/storage/ScriptURI.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptURI.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/ScriptURI.hxx b/scripting/source/storage/ScriptURI.hxx
index bb686428fa..3b1155b7a9 100644
--- a/scripting/source/storage/ScriptURI.hxx
+++ b/scripting/source/storage/ScriptURI.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptURI.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/XMLElement.cxx b/scripting/source/storage/XMLElement.cxx
index f6dcf3b4b3..0af05aa019 100644
--- a/scripting/source/storage/XMLElement.cxx
+++ b/scripting/source/storage/XMLElement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLElement.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/XMLElement.hxx b/scripting/source/storage/XMLElement.hxx
index 375912c2f6..b3d3b39a64 100644
--- a/scripting/source/storage/XMLElement.hxx
+++ b/scripting/source/storage/XMLElement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLElement.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/storage/makefile.mk b/scripting/source/storage/makefile.mk
index a6f06369a3..c75ec8ca30 100644
--- a/scripting/source/storage/makefile.mk
+++ b/scripting/source/storage/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk
index 970a0c5d7b..d33f32e826 100644
--- a/scripting/source/stringresource/makefile.mk
+++ b/scripting/source/stringresource/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 82f63b0fe9..d494259625 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stringresource.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 62756e48aa..6052ecbd6d 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stringresource.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/util/ant.pmk b/scripting/util/ant.pmk
index 927ceb249b..43d9ea608b 100755..100644
--- a/scripting/util/ant.pmk
+++ b/scripting/util/ant.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: ant.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/util/makefile.mk b/scripting/util/makefile.mk
index 82184a33df..82d9816f22 100644
--- a/scripting/util/makefile.mk
+++ b/scripting/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/util/makefile.pmk b/scripting/util/makefile.pmk
index b8240f7f32..94829c3288 100755..100644
--- a/scripting/util/makefile.pmk
+++ b/scripting/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/util/target.pmk b/scripting/util/target.pmk
index 6c98ccf500..bce41321d1 100755..100644
--- a/scripting/util/target.pmk
+++ b/scripting/util/target.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: target.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/workben/build.xml b/scripting/workben/build.xml
index 1ba7b9666d..06095e9c91 100755..100644
--- a/scripting/workben/build.xml
+++ b/scripting/workben/build.xml
@@ -1,32 +1,28 @@
 <!--
 
   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: build.xml,v $
- 
-  $Revision: 1.31.20.1 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <project name="Scipting Framework Installer" default="jar" basedir=".">
 
diff --git a/scripting/workben/ifc/scripting/ScriptingUtils.java b/scripting/workben/ifc/scripting/ScriptingUtils.java
index cc1569aa6b..3ccdab02e2 100644
--- a/scripting/workben/ifc/scripting/ScriptingUtils.java
+++ b/scripting/workben/ifc/scripting/ScriptingUtils.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptingUtils.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index baf987c33a..27774f2e81 100644
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SecurityDialogUtil.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XFunction.java b/scripting/workben/ifc/scripting/_XFunction.java
index 65af406629..cf766f9335 100644
--- a/scripting/workben/ifc/scripting/_XFunction.java
+++ b/scripting/workben/ifc/scripting/_XFunction.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XFunction.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XFunctionProvider.java b/scripting/workben/ifc/scripting/_XFunctionProvider.java
index 7e30c27cfc..c8415ab809 100644
--- a/scripting/workben/ifc/scripting/_XFunctionProvider.java
+++ b/scripting/workben/ifc/scripting/_XFunctionProvider.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XFunctionProvider.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptInfo.java b/scripting/workben/ifc/scripting/_XScriptInfo.java
index f3ccfbb546..cf28bda97e 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfo.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptInfo.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index 88a3faa877..aa50e31155 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptInfoAccess.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index ea886f851a..04faf328a6 100644
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptInvocation.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index ac62362b85..cd05467b9f 100644
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptNameResolver.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index f66f3efda6..6bb03a3220 100644
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptSecurity.java,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
index 1413f3043a..acace89188 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptStorageManager.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
index d33f9aea7b..4462cc753c 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XScriptStorageRefresh.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/ifc/scripting/makefile.mk b/scripting/workben/ifc/scripting/makefile.mk
index 472c8d15a1..2520b7506a 100644
--- a/scripting/workben/ifc/scripting/makefile.mk
+++ b/scripting/workben/ifc/scripting/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/workben/installer/ExceptionTraceHelper.java b/scripting/workben/installer/ExceptionTraceHelper.java
index 54c7f59598..b243f05d5e 100644
--- a/scripting/workben/installer/ExceptionTraceHelper.java
+++ b/scripting/workben/installer/ExceptionTraceHelper.java
@@ -1,13 +1,10 @@
 /************************************************************************* 
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ExceptionTraceHelper.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/installer/Scripting.xcs b/scripting/workben/installer/Scripting.xcs
index fcb6b99e7c..efcaa602d0 100644
--- a/scripting/workben/installer/Scripting.xcs
+++ b/scripting/workben/installer/Scripting.xcs
@@ -2,13 +2,10 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Scripting.xcs,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/makefile.mk b/scripting/workben/makefile.mk
index 9c3e1aa0e4..075954c8bb 100755..100644
--- a/scripting/workben/makefile.mk
+++ b/scripting/workben/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java
index 85d8150798..d3a5d30ae3 100644
--- a/scripting/workben/mod/_scripting/Dispatch.java
+++ b/scripting/workben/mod/_scripting/Dispatch.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Dispatch.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java
index 01f13a3428..fd94635dab 100644
--- a/scripting/workben/mod/_scripting/Function.java
+++ b/scripting/workben/mod/_scripting/Function.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Function.java,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java
index a34aa1958e..5f2d969608 100644
--- a/scripting/workben/mod/_scripting/FunctionProvider.java
+++ b/scripting/workben/mod/_scripting/FunctionProvider.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FunctionProvider.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java
index 2908c947b2..9fb55ca187 100644
--- a/scripting/workben/mod/_scripting/ScriptInfo.java
+++ b/scripting/workben/mod/_scripting/ScriptInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptInfo.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
index 0979faba70..28cd4d4843 100644
--- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
+++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptRuntimeManager.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java
index 19c8471b7e..4b82999390 100644
--- a/scripting/workben/mod/_scripting/ScriptStorage.java
+++ b/scripting/workben/mod/_scripting/ScriptStorage.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptStorage.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java
index 528ac129c3..f0f863b713 100644
--- a/scripting/workben/mod/_scripting/ScriptStorageManager.java
+++ b/scripting/workben/mod/_scripting/ScriptStorageManager.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ScriptStorageManager.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/TestDataLoader.java b/scripting/workben/mod/_scripting/TestDataLoader.java
index 55d1824ef3..547bd8ab47 100644
--- a/scripting/workben/mod/_scripting/TestDataLoader.java
+++ b/scripting/workben/mod/_scripting/TestDataLoader.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TestDataLoader.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/scripting/workben/mod/_scripting/makefile.mk b/scripting/workben/mod/_scripting/makefile.mk
index 4abfea1ea0..65a0dd393d 100644
--- a/scripting/workben/mod/_scripting/makefile.mk
+++ b/scripting/workben/mod/_scripting/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/QuerySaveDocument.hxx
index c0c523c7ab..e76f6c71e2 100644
--- a/sfx2/inc/QuerySaveDocument.hxx
+++ b/sfx2/inc/QuerySaveDocument.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: QuerySaveDocument.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx
index 9ac21f1a6a..fe0be6424a 100644
--- a/sfx2/inc/about.hxx
+++ b/sfx2/inc/about.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: about.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index faff7e0234..5e2fb938a1 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: arrdecl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/basmgr.hxx
index ab0ef97bfe..f081c285e9 100644
--- a/sfx2/inc/basmgr.hxx
+++ b/sfx2/inc/basmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basmgr.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index cd4a70cc5c..48a03c9622 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bitset.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
index 3d938f46df..acb8016d3f 100644
--- a/sfx2/inc/brokenpackageint.hxx
+++ b/sfx2/inc/brokenpackageint.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: brokenpackageint.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index d544401cec..2b5fe68bc2 100644
--- a/sfx2/inc/configmgr.hxx
+++ b/sfx2/inc/configmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: configmgr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/dinfedt.hxx
index 7e6a4fc198..c7ad98a136 100644
--- a/sfx2/inc/dinfedt.hxx
+++ b/sfx2/inc/dinfedt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfedt.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/docinsert.hxx
index ef45af05e9..c4e4be1218 100644
--- a/sfx2/inc/docinsert.hxx
+++ b/sfx2/inc/docinsert.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docinsert.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 708841de7d..a99f9a3177 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docvor.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc
index b2a71c788d..a5db7b4fdb 100644
--- a/sfx2/inc/filedlghelper.hrc
+++ b/sfx2/inc/filedlghelper.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filedlghelper.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 22ba209231..7fc5ba91f8 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmload.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index c9a2cc507e..7dd54559dc 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fwkhelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index f1de3d8fea..a317b57962 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: guisaveas.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index a593f0824e..6b48a377d7 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: idpool.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx
index 7d70d6042f..ead9b6988c 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/imagemgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagemgr.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index c144b76e45..76b95f19ae 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imgmgr.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 8eb30d8ba2..488e8b958b 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: inettbc.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/mailmodelapi.hxx
index 97378338ee..4ac0d756f0 100644
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/mailmodelapi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailmodelapi.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk
index 7a0c0ac21e..79aa70b3db 100644
--- a/sfx2/inc/makefile.mk
+++ b/sfx2/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/mieclip.hxx
index 2baafe3176..86124594e1 100644
--- a/sfx2/inc/mieclip.hxx
+++ b/sfx2/inc/mieclip.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mieclip.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx
index ce7b0aeaaa..9e51265eb9 100644
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/minfitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: minfitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index c26b5e2e8f..8f420f8aed 100644
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msgnodei.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index ac29d513cc..4ce5e0dc59 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: orgmgr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/pch/precompiled_sfx2.cxx b/sfx2/inc/pch/precompiled_sfx2.cxx
index 6995bd140c..c87b9d94ed 100644
--- a/sfx2/inc/pch/precompiled_sfx2.cxx
+++ b/sfx2/inc/pch/precompiled_sfx2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_sfx2.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index d5f547494e..8267d33bda 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_sfx2.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/progind.hxx b/sfx2/inc/progind.hxx
index 03e73ce8d2..a78d924234 100644
--- a/sfx2/inc/progind.hxx
+++ b/sfx2/inc/progind.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: progind.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
index 55789c575b..dc0022a57e 100644
--- a/sfx2/inc/resmgr.hxx
+++ b/sfx2/inc/resmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resmgr.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
index 1f0d3d38e4..def1e4ab5a 100644
--- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
+++ b/sfx2/inc/sfx2/DocumentMetadataAccess.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: DocumentMetadataAccess.hxx,v $
- * $Revision: 1.1.2.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx
index d96e6c030d..068a6c4a45 100644
--- a/sfx2/inc/sfx2/Metadatable.hxx
+++ b/sfx2/inc/sfx2/Metadatable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SwMetadatable.hxx,v $
- * $Revision: 1.1.2.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index 0ae6fbb751..7871fbe66a 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.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: XmlIdRegistry.hxx,v $
- * $Revision: 1.1.2.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 39dde5cdc6..039b40c12f 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index bfdd1a2ea9..dee99670d1 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appuno.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 8b187a5416..54ff9fae23 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.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: basedlgs.hxx,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/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index eccbc16cbc..51551edc43 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bindings.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx
index 14bad0d08b..04d1f3a7f6 100644
--- a/sfx2/inc/sfx2/chalign.hxx
+++ b/sfx2/inc/sfx2/chalign.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chalign.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index e0a103daed..b519727213 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: childwin.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index e73b65afc1..799f3431ec 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cntids.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index 59c680ff37..579d7b1299 100644
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/sfx2/inc/sfx2/controlwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlwrapper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index 01582644bc..0244b4b785 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ctrlitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc
index 32e1341634..a2b3e8bb63 100644
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/sfx2/inc/sfx2/dialogs.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialogs.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index ce84acd12a..40354b26af 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfdlg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index f126da5341..c62911eccc 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatch.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/dllapi.h b/sfx2/inc/sfx2/dllapi.h
index d9c7959e55..f086f3fc70 100644
--- a/sfx2/inc/sfx2/dllapi.h
+++ b/sfx2/inc/sfx2/dllapi.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dllapi.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index c555835434..3e05e7f698 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docfac.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index ad9e4e06b7..3b173a27c1 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docfile.hxx,v $
- * $Revision: 1.8.118.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 4eee23f75f..653ad1c811 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.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: docfilt.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/sfx2/inc/sfx2/docinf.hxx b/sfx2/inc/sfx2/docinf.hxx
index f3542a90b3..9f7da19321 100644
--- a/sfx2/inc/sfx2/docinf.hxx
+++ b/sfx2/inc/sfx2/docinf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docinf.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 5e2e598ebe..59b58e0398 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dockwin.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx
index 1b45385f0a..495b968ae5 100644
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/sfx2/inc/sfx2/docmacromode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docmacromode.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
index 2dcf9c1c6b..977916ed53 100644
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docstoragemodifylistener.hxx,v $
- * $Revision: 1.4.28.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 1dbb67b8c8..9f034907b2 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctdlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 3e9bb3b15a..d688c52989 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctempl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 60255b4b21..c2d3b41fcb 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: event.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index d228f4e4d6..9a8656d33b 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.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: evntconf.hxx,v $
- * $Revision: 1.3.28.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index cfed48aa73..069b2871b4 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fcontnr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index c809fac259..5d8a518020 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.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: filedlghelper.hxx,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/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index c536e7d966..60dfd8d851 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frame.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index 1ebf31042b..a14d8e2d26 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdescr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index 0241b173d6..e3e9c4f9f7 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmhtml.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index 4f115cbf06..93f45f092b 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmhtmlw.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx
index 7812b3f5bb..0edf8e3b9d 100644
--- a/sfx2/inc/sfx2/genlink.hxx
+++ b/sfx2/inc/sfx2/genlink.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: genlink.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index 0a9b97940e..6ec5274305 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hintpost.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx
index 18a82738c6..1aa34a393b 100644
--- a/sfx2/inc/sfx2/imgdef.hxx
+++ b/sfx2/inc/sfx2/imgdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imgdef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index 10dee3a4b6..141de703c2 100644
--- a/sfx2/inc/sfx2/ipclient.hxx
+++ b/sfx2/inc/sfx2/ipclient.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ipclient.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx
index de5d1c0774..1112f5825c 100644
--- a/sfx2/inc/sfx2/itemconnect.hxx
+++ b/sfx2/inc/sfx2/itemconnect.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemconnect.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index 738f1039bc..91964f5bf5 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemwrapper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx
index 0eab118c30..91ae784105 100644
--- a/sfx2/inc/sfx2/layout-post.hxx
+++ b/sfx2/inc/sfx2/layout-post.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx
index bb8935c926..fdd4d418eb 100644
--- a/sfx2/inc/sfx2/layout-pre.hxx
+++ b/sfx2/inc/sfx2/layout-pre.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx
index 4b84083f81..a5099a3a6b 100644
--- a/sfx2/inc/sfx2/layout-tabdlg.hxx
+++ b/sfx2/inc/sfx2/layout-tabdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabdlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index f71809aac1..d92ed2ac4a 100644
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.hxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 #ifndef _SFX2_LAYOUT_HXX
 #define _SFX2_LAYOUT_HXX
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index de41985a07..b2f0c98bdb 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkmgr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 7838760ca1..b4c3189afc 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.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: linksrc.hxx,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/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index 65ec501cb8..6a30854626 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.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: lnkbase.hxx,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/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 02327edd81..af4f92212c 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macrconf.hxx,v $
- * $Revision: 1.4.142.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index 9bb03415bd..8c5f070c12 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index e3aedd1b8d..5cd5d3fce4 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mgetempl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index 49a41c7ada..cbfe46e707 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: minarray.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index cad565fbe1..cde03de643 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: minstack.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index fd06202cd3..12fa7bc907 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mnuitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 8a9aca1364..d12e184fc6 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mnumgr.hxx,v $
- * $Revision: 1.4.84.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -105,11 +102,11 @@ private:
     DECL_LINK( SelectHdl, void * );
     Menu*				pSVMenu;
 
-private:

-                        // only declared, but not defined: don't allow copying

-                        SfxPopupMenuManager( const SfxPopupMenuManager& );

-                        SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );

-

+private:
+                        // only declared, but not defined: don't allow copying
+                        SfxPopupMenuManager( const SfxPopupMenuManager& );
+                        SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
+
 public:
                         SfxPopupMenuManager( const ResId&, SfxBindings& );
                         SfxPopupMenuManager( PopupMenu*, SfxBindings& );
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index fc704e6e47..ee968a6990 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: module.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 4dd824e2fd..ad549384ba 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msg.hxx,v $
- * $Revision: 1.4.82.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 741f79008f..a268d2896b 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msgpool.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx
index bf2f221278..a783950dbe 100644
--- a/sfx2/inc/sfx2/navigat.hxx
+++ b/sfx2/inc/sfx2/navigat.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: navigat.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 88050adf69..7f2fd25a7c 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: new.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index 24bed2e317..d2989ad0ad 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newstyle.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index ca4a9ad1a2..ec13a2a7aa 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objface.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index b4f359d9a3..2c8d5c6c96 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index d9996b0d4b..f9534a6b87 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objsh.hxx,v $
- * $Revision: 1.14.72.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
index 74083423b1..e29e17e894 100644
--- a/sfx2/inc/sfx2/objuno.hxx
+++ b/sfx2/inc/sfx2/objuno.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objuno.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 2cc5ba1133..2a979477fa 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index 84600cc073..f8f523eb95 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 0295736f01..64f9a38e56 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.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: printopt.hxx,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/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 73419aa59b..5487ef98a7 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prnmon.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 121520976b..0f0f780694 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: progress.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index 9f7e0e910a..106a1c76ef 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: querystatus.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 5ec41cd73c..4e33b13081 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: request.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 09d5087d3c..55ce0b5196 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfx.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 6fc721d38b..796e15f387 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxbasecontroller.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index e6d68889e4..b836541027 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sfxbasemodel.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.13.28.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index 2f1b4676ad..0e29305cbc 100644
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxdefs.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 5b76e6a9ec..694f3217cb 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxdlg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 811db2f4db..460e4e37b3 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxhtml.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx
index 7cb105e62d..83e046cf8f 100644
--- a/sfx2/inc/sfx2/sfxmodelfactory.hxx
+++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxmodelfactory.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 09a9849d7c..3c1d21a0bc 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -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: sfxsids.hrc,v $
- * $Revision: 1.12.104.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index 57f3beb7dd..88f38b0ea1 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxstatuslistener.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 2ddce731e6..bbfef327ab 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxuno.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 154cef1257..4a83cc17f4 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shell.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/sfx2/inc/sfx2/signaturestate.hxx
index a75114ea98..af7ef3d129 100644
--- a/sfx2/inc/sfx2/signaturestate.hxx
+++ b/sfx2/inc/sfx2/signaturestate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: signaturestate.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/srchdefs.hxx b/sfx2/inc/sfx2/srchdefs.hxx
index ebc03c6ac2..ae47586b1c 100644
--- a/sfx2/inc/sfx2/srchdefs.hxx
+++ b/sfx2/inc/sfx2/srchdefs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchdefs.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx
index 373c0b4e85..024969184b 100644
--- a/sfx2/inc/sfx2/srchitem.hxx
+++ b/sfx2/inc/sfx2/srchitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 5d7c8d4245..407df0fbd5 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: styfitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index 4e144f8ca2..d77dd02bd1 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: styledlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index ca312124e7..486baaf796 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.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: tabdlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -248,8 +245,8 @@ namespace sfx { class ItemConnectionBase; }
 class SFX2_DLLPUBLIC SfxTabPage: public TabPage
 {
 friend class SfxTabDialog;
-    #if ENABLE_LAYOUT

-     friend class layout::SfxTabDialog;

+    #if ENABLE_LAYOUT
+     friend class layout::SfxTabDialog;
     #endif
 
 private:
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 0d530d4114..399950ae83 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxctrl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index c59d1ff062..3602f200e2 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/templdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: templdlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/topfrm.hxx b/sfx2/inc/sfx2/topfrm.hxx
index c74dbb9fe7..95551ad5e3 100644
--- a/sfx2/inc/sfx2/topfrm.hxx
+++ b/sfx2/inc/sfx2/topfrm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: topfrm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index b83bddad56..1aeb7dc984 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoctitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/sfx2/inc/sfx2/userinputinterception.hxx
index 5b4d075953..16504af633 100644
--- a/sfx2/inc/sfx2/userinputinterception.hxx
+++ b/sfx2/inc/sfx2/userinputinterception.hxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: userinputinterception.hxx,v $
-*
-* $Revision: 1.2 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 #ifndef USERINPUTINTERCEPTION_HXX
 #define USERINPUTINTERCEPTION_HXX
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index b551a4942f..596098ce8d 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewfrm.hxx,v $
- * $Revision: 1.5.46.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index ae45545cba..88fade33cf 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewsh.hxx,v $
- * $Revision: 1.5.46.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfxbasic.hxx b/sfx2/inc/sfxbasic.hxx
index fbf97ce76c..ff5f097500 100644
--- a/sfx2/inc/sfxbasic.hxx
+++ b/sfx2/inc/sfxbasic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxbasic.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index 261b9f895b..debaed3ac8 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxhelp.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfxresid.hxx
index b424205633..ceea5452a0 100644
--- a/sfx2/inc/sfxresid.hxx
+++ b/sfx2/inc/sfxresid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxresid.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 9d135df393..6c6ec89a04 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sorgitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index e5ad040803..eafacb69cc 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchdlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx
index 6a32a70748..6b1cf5cebb 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/stbitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stbitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx
index 46b437b0f2..a5cc1ad01f 100644
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/tplpitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplpitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/viewfac.hxx
index c500f38df1..53522c5436 100644
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/viewfac.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewfac.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
index 57740db29e..d5dc17e183 100644
--- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
+++ b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckGlobalEventBroadcaster_writer1.java,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/DocHelper/DialogThread.java b/sfx2/qa/complex/DocHelper/DialogThread.java
index 3ea568f0c8..41e425ad4c 100644
--- a/sfx2/qa/complex/DocHelper/DialogThread.java
+++ b/sfx2/qa/complex/DocHelper/DialogThread.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DialogThread.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/DocHelper/WriterHelper.java b/sfx2/qa/complex/DocHelper/WriterHelper.java
index a7dbe76316..86ae386e1f 100644
--- a/sfx2/qa/complex/DocHelper/WriterHelper.java
+++ b/sfx2/qa/complex/DocHelper/WriterHelper.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WriterHelper.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/DocHelper/makefile.mk
index 2f14197c36..484e9dbbe9 100644
--- a/sfx2/qa/complex/DocHelper/makefile.mk
+++ b/sfx2/qa/complex/DocHelper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6.134.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/DocumentMetaData.java
index 8a4c1a91bd..39e911f5a9 100644
--- a/sfx2/qa/complex/DocumentMetaData.java
+++ b/sfx2/qa/complex/DocumentMetaData.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocumentMetaData.java,v $
- * $Revision: 1.3.170.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/DocumentMetadataAccessTest.java
index 86848ac4bf..3cb0155d03 100644
--- a/sfx2/qa/complex/DocumentMetadataAccessTest.java
+++ b/sfx2/qa/complex/DocumentMetadataAccessTest.java
@@ -1,14 +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: DocumentMetadataAccessTest.java,v $
- *
- * $Revision: 1.1.2.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
+ *
  ************************************************************************/
 
 package complex.framework;
diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java
index 6a6281a574..11851a982b 100644
--- a/sfx2/qa/complex/docinfo/DocumentProperties.java
+++ b/sfx2/qa/complex/docinfo/DocumentProperties.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocumentProperties.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk
index 7c074ccbe8..f6bf75b84c 100644
--- a/sfx2/qa/complex/docinfo/makefile.mk
+++ b/sfx2/qa/complex/docinfo/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7.134.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/makefile.mk
index 5c0006df9e..29982ec7df 100644
--- a/sfx2/qa/complex/makefile.mk
+++ b/sfx2/qa/complex/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.134.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java
index c50650c4f1..f5512bf972 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StandaloneDocumentInfoTest.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
index a239b32481..ad4c361602 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StandaloneDocumentInfoUnitTest.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/standalonedocumentinfo/Test01.java
index 67c45b50ce..7debbd5f96 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/Test01.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Test01.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java
index 1a846a1ec7..bea1d1820f 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TestHelper.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
index 850fc305d5..3b9cfecb8e 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
+++ b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3.134.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk
index 9d5403bb7c..d5fbf87ffe 100644
--- a/sfx2/qa/unoapi/makefile.mk
+++ b/sfx2/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 5da69fa977..f20cdbd7c3 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -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: appslots.sdi,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 6fb1b161b2..d162395351 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 3af8e54d6c..146fd050b2 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk
index f8def0a3c2..2fcc93cc56 100644
--- a/sfx2/sdi/makefile.mk
+++ b/sfx2/sdi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/sdi/mdislots.sdi b/sfx2/sdi/mdislots.sdi
index 88ffba4505..2759f6bcd4 100644
--- a/sfx2/sdi/mdislots.sdi
+++ b/sfx2/sdi/mdislots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 26f55ccdd1..e13b26485e 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -5897,31 +5893,31 @@ SfxVoidItem ExportDialog SID_EXPORT_DIALOG
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ImportDialog SID_IMPORT_DIALOG

-()

-[

-    /* flags: */

-    AutoUpdate = FALSE,

-    Cachable = Cachable,

-    FastCall = FALSE,

-    HasCoreId = FALSE,

-    HasDialog = FALSE,

-    ReadOnlyDoc = TRUE,

-    Toggle = FALSE,

-    Container = TRUE,

-    RecordAbsolute = FALSE,

-    RecordPerSet;

-    Asynchron;

-

-    /* config: */

-    AccelConfig = TRUE,

-    MenuConfig = TRUE,

-    StatusBarConfig = FALSE,

-    ToolBoxConfig = TRUE,

-    GroupId = GID_DOCUMENT;

-]

-

-//--------------------------------------------------------------------------

+SfxVoidItem ImportDialog SID_IMPORT_DIALOG
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = TRUE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_DOCUMENT;
+]
+
+//--------------------------------------------------------------------------
 SfxVoidItem SaveConfiguration SID_SAVECONFIG
 (SfxStringItem FileName SID_CFGFILE)
 [
diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi
index 7954591236..d15f6424ec 100644
--- a/sfx2/sdi/sfxslots.sdi
+++ b/sfx2/sdi/sfxslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 1919f3d7a6..4d14d927ad 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d1aa10f5de..2227165b04 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.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: app.cxx,v $
- * $Revision: 1.112 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 112c5c4506..a9bc25c36b 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -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: app.hrc,v $
- * $Revision: 1.49 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 555c7467aa..7d5d232a31 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -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: app.src,v $
- * $Revision: 1.122 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index a7d965a097..65bb8ccf7c 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appbas.cxx,v $
- * $Revision: 1.52 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index f6369b1d2a..f12527a512 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appbaslib.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 172c584c93..6073758d68 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appcfg.cxx,v $
- * $Revision: 1.74 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index dec26b4f0c..226398f4aa 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appchild.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index d04ebcf822..49746d1eb6 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appdata.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 45e1e23d55..3cc38c9411 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appdde.cxx,v $
- * $Revision: 1.19.142.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index a995006238..be50d47d00 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appinit.cxx,v $
- * $Revision: 1.65 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index d0e1e40f0d..121ea21228 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appmain.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 1768229b1d..e09ba5af27 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appmisc.cxx,v $
- * $Revision: 1.58 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 17b7b432eb..d1be97724e 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.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: appopen.cxx,v $
- * $Revision: 1.121.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 213abbb8df..de091d0146 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appquit.cxx,v $
- * $Revision: 1.45 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index bbd1041f5f..a2f34b4727 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appreg.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7a70f6f094..7bb0176937 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.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: appserv.cxx,v $
- * $Revision: 1.78 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 81d198412a..a88cd2376f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appuno.cxx,v $
- * $Revision: 1.131 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index ae8f0e6abe..512815210c 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: childwin.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/dde.hrc b/sfx2/source/appl/dde.hrc
index 05300a3974..1940ba7823 100644
--- a/sfx2/source/appl/dde.hrc
+++ b/sfx2/source/appl/dde.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dde.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/dde.src b/sfx2/source/appl/dde.src
index 9c62559b0c..22df8eff16 100644
--- a/sfx2/source/appl/dde.src
+++ b/sfx2/source/appl/dde.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dde.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index d17d126ce9..1909bcac2e 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fwkhelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index 3af1175a6b..c49cee7aaa 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpdispatch.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index a8cfa85e42..343dca505f 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpdispatch.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 981752c5d8..7dbf2bdec9 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpinterceptor.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 7bc10c3139..a48f1f2c6c 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpinterceptor.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 9c2a7996e3..f7cccf2712 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imagemgr.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 4c0ef295c0..3cdc3064fb 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imestatuswindow.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index b26a1c9075..71c0b371f7 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imestatuswindow.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 75df926968..9e430ec9e7 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impldde.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 65792f9f0e..1a30d08425 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impldde.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index de1c524ec7..81f2eede8b 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkmgr2.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 5892f99781..0fe5234898 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.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: linksrc.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 41a139d19b..c36582ff77 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.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: lnkbase2.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/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
index 48d1258e28..c6d6547010 100644
--- a/sfx2/source/appl/makefile.mk
+++ b/sfx2/source/appl/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.56 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index a25f25c01f..cd5fb9ab76 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: module.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 9e0c8a1da3..20b44950fa 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newhelp.cxx,v $
- * $Revision: 1.130 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc
index 7bfc1e3f2d..eda8c6ccdf 100644
--- a/sfx2/source/appl/newhelp.hrc
+++ b/sfx2/source/appl/newhelp.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newhelp.hrc,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index c32dc800ad..3f9b632d2b 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newhelp.hxx,v $
- * $Revision: 1.59 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 5dbd8033b1..8a2b4f760f 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newhelp.src,v $
- * $Revision: 1.97 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index 9a07e1dcea..1c59613fdc 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: panelist.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 1fabfa52fa..7d4bb0db17 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfx.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/sfxdll.cxx b/sfx2/source/appl/sfxdll.cxx
index 1d788dba42..956a61b3e2 100644
--- a/sfx2/source/appl/sfxdll.cxx
+++ b/sfx2/source/appl/sfxdll.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxdll.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index f9b2777852..1ce2ebdebb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.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: sfxhelp.cxx,v $
- * $Revision: 1.82.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index b96a5e7d03..cf4a129e87 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxpicklist.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 985af75b1f..f0164f3fd7 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shutdownicon.cxx,v $
- * $Revision: 1.64 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx
index ae2c80b2a7..5c40475139 100644
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ b/sfx2/source/appl/shutdowniconOs2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shutdowniconOs2.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index e9326b4a22..64949ca2f0 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shutdowniconaqua.mm,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 53bbc380ad..01ef550aa2 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shutdowniconw32.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 5e2bb23e93..e1745222e8 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: workwin.cxx,v $
- * $Revision: 1.75 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 128374225b..6e6606a670 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xpackcreator.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx
index 5fb195a838..e5a2062702 100644
--- a/sfx2/source/appl/xpackcreator.hxx
+++ b/sfx2/source/appl/xpackcreator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xpackcreator.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
index d8d1fd95fe..3daa29bfd1 100644
--- a/sfx2/source/bastyp/bastyp.hrc
+++ b/sfx2/source/bastyp/bastyp.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bastyp.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src
index 63f5a3e742..5ef74f5874 100644
--- a/sfx2/source/bastyp/bastyp.src
+++ b/sfx2/source/bastyp/bastyp.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bastyp.src,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 34aa3efdf8..653c23ccf8 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bitset.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 9f944e01b4..ea863c065e 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltfnc.cxx,v $
- * $Revision: 1.79 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src
index a95d246e91..4203163ece 100644
--- a/sfx2/source/bastyp/fltfnc.src
+++ b/sfx2/source/bastyp/fltfnc.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltfnc.src,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 0ec1bd03f8..aab358b502 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltlst.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 797562bc54..b3afb42563 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltlst.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index f1071be264..f7450ed288 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmhtml.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index d93f99bda7..bdb9aef114 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmhtmlw.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 80ac52b902..5ceaf336a1 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helper.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/makefile.mk b/sfx2/source/bastyp/makefile.mk
index 926107a6e9..cd490599a3 100644
--- a/sfx2/source/bastyp/makefile.mk
+++ b/sfx2/source/bastyp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index b21c8771a6..ee2b15d34a 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mieclip.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 592e20f15b..978239239c 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: minarray.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index 8b7482d955..49938c729b 100644
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: misc.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 06791f4435..aa951a64da 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: progress.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index eba014f892..b5ec49a1e9 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxhtml.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 0e1447945f..11ab5a7240 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxresid.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/config/config.hrc b/sfx2/source/config/config.hrc
index 156bc72999..037c96c97e 100644
--- a/sfx2/source/config/config.hrc
+++ b/sfx2/source/config/config.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: config.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/config/config.src b/sfx2/source/config/config.src
index cbd3bbf3ad..cb3259e09a 100644
--- a/sfx2/source/config/config.src
+++ b/sfx2/source/config/config.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: config.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index ec52cacbeb..f6572c839a 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.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: evntconf.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/config/makefile.mk b/sfx2/source/config/makefile.mk
index cf2e07e0b5..fde86a7f02 100644
--- a/sfx2/source/config/makefile.mk
+++ b/sfx2/source/config/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 02efe0aeba..c0e90e94a6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bindings.cxx,v $
- * $Revision: 1.53.46.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 71bfbbb5c0..847d141073 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ctrlitem.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index d76697b6c5..64740b41b1 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dispatch.cxx,v $
- * $Revision: 1.56.126.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 84c9f7feb5..0c7cf9bb3b 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macrconf.cxx,v $
- * $Revision: 1.25.142.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 2afd8d6d55..b94ef2eb4e 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macro.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
index 9d936549b5..3f4f84073d 100644
--- a/sfx2/source/control/makefile.mk
+++ b/sfx2/source/control/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.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index fa940283e1..ef90e709f4 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: minfitem.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index abe1c78620..c1f58f40ca 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msg.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 33c78f2e0d..6d643b8bac 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msgpool.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index cf8d66f448..010e8c8b40 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objface.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index a7448152ef..ea4dac8ae8 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: querystatus.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 80de021867..3e15454247 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: request.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 4fe13466f4..7af645b41c 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxstatuslistener.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 403c331256..f2155aef8c 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shell.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index d2fe9eb43b..cb24fe34e9 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sorgitm.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx
index 1af26b9c38..7f213507ce 100644
--- a/sfx2/source/control/srchitem.cxx
+++ b/sfx2/source/control/srchitem.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: srchitem.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 795fb5e9be..a678893e03 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statcach.cxx,v $
- * $Revision: 1.36.180.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 11e9fd3d77..133ca98aa4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoctitm.cxx,v $
- * $Revision: 1.58 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index c37d824a9a..ffd4efb3f1 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.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: about.cxx,v $
- * $Revision: 1.41.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 5ed5569ea3..6accb6a560 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.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: alienwarn.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/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc
index fb00a3cb2f..e3a23dc578 100644
--- a/sfx2/source/dialog/alienwarn.hrc
+++ b/sfx2/source/dialog/alienwarn.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: alienwarn.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index 9be25ff919..7aa6f32307 100644
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: alienwarn.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index d93a4884c1..5baa7e2999 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.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: basedlgs.cxx,v $
- * $Revision: 1.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index e41fbc0746..4396ccb034 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -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: dialog.hrc,v $
- * $Revision: 1.32.70.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index c50b17436c..a54d2c340d 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -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: dialog.src,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index d59d36855c..174751c51c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfdlg.cxx,v $
- * $Revision: 1.43.42.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index ba2b30ecc3..7c214d5fc4 100644
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfdlg.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index d5c57d56ab..135e0cc119 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfdlg.src,v $
- * $Revision: 1.55 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 5cc3da113b..ec6bfad2d3 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfedt.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/dinfedt.hrc b/sfx2/source/dialog/dinfedt.hrc
index 46daa159cb..8774824dae 100644
--- a/sfx2/source/dialog/dinfedt.hrc
+++ b/sfx2/source/dialog/dinfedt.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfedt.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src
index 234c91fe3d..7f48754875 100644
--- a/sfx2/source/dialog/dinfedt.src
+++ b/sfx2/source/dialog/dinfedt.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dinfedt.src,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 89aaf2a240..342ba46348 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dockwin.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index e14d9118f0..24b4f3e40f 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.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: filedlghelper.cxx,v $
- * $Revision: 1.144 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src
index ef5bd04e83..61df133505 100644
--- a/sfx2/source/dialog/filedlghelper.src
+++ b/sfx2/source/dialog/filedlghelper.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filedlghelper.src,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 09ddcfa868..3daf5bb246 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filedlgimpl.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 47a75137d8..ed229e7911 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.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: filtergrouping.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx
index f8c2acf8da..255779e03e 100644
--- a/sfx2/source/dialog/filtergrouping.hxx
+++ b/sfx2/source/dialog/filtergrouping.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtergrouping.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx
index 5ad3254a87..3223dd6006 100644
--- a/sfx2/source/dialog/intro.cxx
+++ b/sfx2/source/dialog/intro.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: intro.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index ddf97257bc..b71a0110e4 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemconnect.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 5d812751e8..e3f3db8ff1 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailmodel.cxx,v $
- * $Revision: 1.51 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index d2158c3dad..d01e17d2c1 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailmodelapi.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/mailwindow.src b/sfx2/source/dialog/mailwindow.src
index 00e3db644e..e5648e7f41 100644
--- a/sfx2/source/dialog/mailwindow.src
+++ b/sfx2/source/dialog/mailwindow.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailwindow.src,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index 230bbe432a..f9ad381536 100644
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.43 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 24d08ee3e4..291487f44d 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mgetempl.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/mgetempl.hrc b/sfx2/source/dialog/mgetempl.hrc
index 1d0f0e4a19..e998baba93 100644
--- a/sfx2/source/dialog/mgetempl.hrc
+++ b/sfx2/source/dialog/mgetempl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mgetempl.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 96734c30d5..f07d0873e4 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mgetempl.src,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 348ddc6412..d7f258e7cc 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: navigat.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 192f5917f3..78d1a76640 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newstyle.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/newstyle.hrc b/sfx2/source/dialog/newstyle.hrc
index 5d690f7fe1..991f5f83ec 100644
--- a/sfx2/source/dialog/newstyle.hrc
+++ b/sfx2/source/dialog/newstyle.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newstyle.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index e522dfa24e..fa5fa62a2e 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newstyle.src,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 7625e78167..2bf14fb649 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: partwnd.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 628258eb13..2dbddabb0a 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/passwd.hrc b/sfx2/source/dialog/passwd.hrc
index 112695a1e2..5be0446fd7 100644
--- a/sfx2/source/dialog/passwd.hrc
+++ b/sfx2/source/dialog/passwd.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src
index c7fbaafcdb..fc58ecfda2 100644
--- a/sfx2/source/dialog/passwd.src
+++ b/sfx2/source/dialog/passwd.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.src,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index fbfc43bc90..bdb8d4bc54 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.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: printopt.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/printopt.hrc b/sfx2/source/dialog/printopt.hrc
index 86d79c0cd2..58f91eceb7 100644
--- a/sfx2/source/dialog/printopt.hrc
+++ b/sfx2/source/dialog/printopt.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printopt.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index d1daf1b07a..4217539a3a 100644
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printopt.src,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index bb9ad7b9a5..f93e9ebe3b 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recfloat.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 3d6d672902..5bdde1f57a 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recfloat.src,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index 91e7cc3394..fc4c0ee46c 100644
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxdlg.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/sfxurl.cxx b/sfx2/source/dialog/sfxurl.cxx
index 29a8b388d8..47e4062ac3 100644
--- a/sfx2/source/dialog/sfxurl.cxx
+++ b/sfx2/source/dialog/sfxurl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxurl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index e35859a946..cee0fe418a 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitwin.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 4a97f85a9d..ee3d9eecb8 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchdlg.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/srchdlg.hrc b/sfx2/source/dialog/srchdlg.hrc
index 69a15f6ac6..cd9c439b2d 100644
--- a/sfx2/source/dialog/srchdlg.hrc
+++ b/sfx2/source/dialog/srchdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchdlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/srchdlg.src b/sfx2/source/dialog/srchdlg.src
index 5008685523..0947f39329 100644
--- a/sfx2/source/dialog/srchdlg.src
+++ b/sfx2/source/dialog/srchdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchdlg.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 941e611549..e63391a61c 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: styfitem.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index dfb7076089..d3e260eafb 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: styledlg.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 6e52807a5c..2d4429deb6 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.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: tabdlg.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 2cc7b52d25..589f4b5abe 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.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: templdlg.cxx,v $
- * $Revision: 1.58.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index f63a40fc3f..ae4de7d19a 100644
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: templdlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index f1e1ba4671..7976d6be5c 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: templdlg.src,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 03103837b2..ee8a5cc5be 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplcitem.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index 5b7a8d796a..00923a6ec0 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplpitem.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 64e7fcda94..0dc514c0ff 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: versdlg.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/versdlg.hrc b/sfx2/source/dialog/versdlg.hrc
index 9c140fab6c..292f234bfa 100644
--- a/sfx2/source/dialog/versdlg.hrc
+++ b/sfx2/source/dialog/versdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: versdlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src
index f77f4ee3af..3e2f20fc5b 100644
--- a/sfx2/source/dialog/versdlg.src
+++ b/sfx2/source/dialog/versdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: versdlg.src,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 112183a4ef..9625ea9588 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.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: DocumentMetadataAccess.cxx,v $
- * $Revision: 1.1.2.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 433b2512df..57d827b569 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.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: SwMetadatable.cxx,v $
- * $Revision: 1.1.2.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index ad1c4bb5c2..642fe3c21a 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: QuerySaveDocument.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 93fbfa1a81..dd1899bfc9 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SfxDocumentMetaData.cxx,v $
- * $Revision: 1.10.32.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
index a1354d2b0f..f85ff3aded 100644
--- a/sfx2/source/doc/applet.cxx
+++ b/sfx2/source/doc/applet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: applet.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/commitlistener.cxx b/sfx2/source/doc/commitlistener.cxx
index b29dac5962..956059de80 100644
--- a/sfx2/source/doc/commitlistener.cxx
+++ b/sfx2/source/doc/commitlistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commitlistener.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/commitlistener.hxx b/sfx2/source/doc/commitlistener.hxx
index 503affae32..572da034ce 100644
--- a/sfx2/source/doc/commitlistener.hxx
+++ b/sfx2/source/doc/commitlistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commitlistener.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index eba39492f3..3e3026a22c 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -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: doc.hrc,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 3f8ab1ae71..7aaabdf7a2 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -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: doc.src,v $
- * $Revision: 1.94 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 1c1ac4ea27..fa806ad716 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docfac.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 00117a17a4..eac85898f7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docfile.cxx,v $
- * $Revision: 1.203.50.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index d8b6d23b8d..e955c43af7 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.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: docfilt.cxx,v $
- * $Revision: 1.23.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index d1e7203e0c..d0f6678d86 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docinf.cxx,v $
- * $Revision: 1.54.174.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 5e2f3776d8..05a84150b4 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docinsert.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index a2e2963479..1476b532d9 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docmacromode.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 5d3ebf483d..a3eabcfc96 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docstoragemodifylistener.cxx,v $
- * $Revision: 1.4.28.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 40fafa0b16..f0a3efb813 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctdlg.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctdlg.hrc b/sfx2/source/doc/doctdlg.hrc
index 0a8154d65d..8deed4699f 100644
--- a/sfx2/source/doc/doctdlg.hrc
+++ b/sfx2/source/doc/doctdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctdlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src
index dad236a2c5..91d966fbd2 100644
--- a/sfx2/source/doc/doctdlg.src
+++ b/sfx2/source/doc/doctdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctdlg.src,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d0ee1aacc8..04adf839a8 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctempl.cxx,v $
- * $Revision: 1.76 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctempl.src b/sfx2/source/doc/doctempl.src
index c8cf0b996f..2c91358f84 100644
--- a/sfx2/source/doc/doctempl.src
+++ b/sfx2/source/doc/doctempl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctempl.src,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index cef00ca6e7..317d2a4cbc 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctemplates.cxx,v $
- * $Revision: 1.42.84.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index 7aed8f4f72..d58bb59308 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctemplateslocal.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 90138a891c..84b1a9cc96 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctemplateslocal.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 830b27d900..7884bfbf8d 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docvor.cxx,v $
- * $Revision: 1.54 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc
index dafc8bcb43..f14f207782 100644
--- a/sfx2/source/doc/docvor.hrc
+++ b/sfx2/source/doc/docvor.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docvor.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index 844ffe97bb..45676bfb1b 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docvor.src,v $
- * $Revision: 1.46 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 3db8bf61ed..d0d3d461ba 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdescr.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 42235cf2af..cac558d52e 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphhelp.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index 294fbcdb04..0cfc7a806d 100644
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphhelp.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/graphhelp.src b/sfx2/source/doc/graphhelp.src
index e9a5559110..1936a8460d 100644
--- a/sfx2/source/doc/graphhelp.src
+++ b/sfx2/source/doc/graphhelp.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphhelp.src,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index e55654043b..7960dfe441 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.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: guisaveas.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -841,8 +838,8 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
     ::rtl::OUString aAdjustToType;
 
     // bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format
-    if ( !(( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED )) && 

-        ( bSetStandardName || GetStorable()->hasLocation() ))

+    if ( !(( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED )) && 
+        ( bSetStandardName || GetStorable()->hasLocation() ))
     {
         uno::Sequence< beans::PropertyValue > aOldFilterProps;
         ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault(
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 071c69a77b..e83a507e6a 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iframe.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
index 66fd03175a..4959ecbed3 100644
--- a/sfx2/source/doc/makefile.mk
+++ b/sfx2/source/doc/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.33 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 726e0bbfc5..f0a0155240 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: new.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/new.hrc b/sfx2/source/doc/new.hrc
index 37f0bd61a3..dd8878bf01 100644
--- a/sfx2/source/doc/new.hrc
+++ b/sfx2/source/doc/new.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: new.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src
index 54d5c8d77a..146f9f6305 100644
--- a/sfx2/source/doc/new.src
+++ b/sfx2/source/doc/new.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: new.src,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 8398679302..d05ea3e44f 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.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: objcont.cxx,v $
- * $Revision: 1.78 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index c50539a0bd..73105d4dd4 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objembed.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 7a08e1b887..37a88e7238 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objitem.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8fb219d7fa..286d78e74f 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objmisc.cxx,v $
- * $Revision: 1.102.104.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 8cf35d3533..85d18023e6 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.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: objserv.cxx,v $
- * $Revision: 1.106 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 972ac57ce6..8b45b42ac7 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.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: objstor.cxx,v $
- * $Revision: 1.212.44.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index e9e37a44c5..da8c95b39f 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objuno.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d7470e9d8b..22915a1090 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.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: objxtor.cxx,v $
- * $Revision: 1.85 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index c0424c2260..06fe747697 100755..100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oleprops.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 7ed7655278..5bd586576a 100755..100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: oleprops.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/opostponedtruncationstream.cxx b/sfx2/source/doc/opostponedtruncationstream.cxx
index b69b54325b..84b1d6a390 100644
--- a/sfx2/source/doc/opostponedtruncationstream.cxx
+++ b/sfx2/source/doc/opostponedtruncationstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opostponedtruncationstream.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/opostponedtruncationstream.hxx b/sfx2/source/doc/opostponedtruncationstream.hxx
index d44c122c6a..bdfa23de67 100644
--- a/sfx2/source/doc/opostponedtruncationstream.hxx
+++ b/sfx2/source/doc/opostponedtruncationstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opostponedtruncationstream.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 6bb9659a62..9cab42889b 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ownsubfilterservice.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 4a8a7e3d77..11adef2bd5 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: plugin.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index ca0e28d322..9c44ac4332 100755..100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.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: printhelper.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index e49628ceb1..9ba05fc20c 100755..100644
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printhelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index d430205a83..8e00672135 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.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: openlocked.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/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx
index 71f709db06..92e9f26da0 100644
--- a/sfx2/source/doc/querytemplate.hxx
+++ b/sfx2/source/doc/querytemplate.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: openlocked.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/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index 45d0dc9a77..28e4c5636e 100755..100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shutdowniconw32.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 25d2d964e9..a28133ba0a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.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: sfxbasemodel.cxx,v $
- * $Revision: 1.139.2.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index 99355c4f62..3cc9d02253 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxmodelfactory.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/explorer/makefile.mk b/sfx2/source/explorer/makefile.mk
index dd70d7a60b..bf2b8c1cde 100644
--- a/sfx2/source/explorer/makefile.mk
+++ b/sfx2/source/explorer/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index a5f69a2e9c..5ac86a9b0b 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nochaos.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx
index e9554397cf..ec573cf007 100644
--- a/sfx2/source/inc/SfxDocumentMetaData.hxx
+++ b/sfx2/source/inc/SfxDocumentMetaData.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SfxDocumentMetaData.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index 20dd3e5cc3..f7c38173fc 100644
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.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: alienwarn.hxx,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/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx
index 9aa4aecee0..8b10fcb843 100644
--- a/sfx2/source/inc/appbas.hxx
+++ b/sfx2/source/inc/appbas.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appbas.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index 73924ce5a5..25ca0efe20 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appbaslib.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 402ca3bdae..65b1689aa6 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: appdata.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
index ee53c7dd66..7fb337d474 100644
--- a/sfx2/source/inc/applet.hxx
+++ b/sfx2/source/inc/applet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: applet.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx
index f1937e40e5..9a6f6acce5 100644
--- a/sfx2/source/inc/doctemplates.hxx
+++ b/sfx2/source/inc/doctemplates.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doctemplates.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index f1a10d7b5f..6d09e9458a 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventsupplier.hxx,v $
- * $Revision: 1.14.28.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/fltfnc.hxx b/sfx2/source/inc/fltfnc.hxx
index 77048f039f..0a078a33c5 100644
--- a/sfx2/source/inc/fltfnc.hxx
+++ b/sfx2/source/inc/fltfnc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltfnc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index 13a4084c20..7a9e7bb3c8 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltoptint.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 78f9071c41..7ca741572b 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helper.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 8e7643975d..7f7bbec82b 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpid.hrc,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/hexplwnd.hxx b/sfx2/source/inc/hexplwnd.hxx
index 51577b16cf..3a7dae15aa 100644
--- a/sfx2/source/inc/hexplwnd.hxx
+++ b/sfx2/source/inc/hexplwnd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hexplwnd.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index 332aaa171f..fae76610ec 100644
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iframe.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/intro.hxx b/sfx2/source/inc/intro.hxx
index 8f0f424aae..35954dc804 100644
--- a/sfx2/source/inc/intro.hxx
+++ b/sfx2/source/inc/intro.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: intro.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index 03a7634aae..b46b0019f1 100644
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mailmodel.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx
index 889fabf280..86b9583f4b 100644
--- a/sfx2/source/inc/mnucfga.hxx
+++ b/sfx2/source/inc/mnucfga.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mnucfga.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx
index 6544287c77..e3aa3c60ca 100644
--- a/sfx2/source/inc/nfltdlg.hxx
+++ b/sfx2/source/inc/nfltdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nfltdlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index 9f000f4eaf..b2611cb4dd 100644
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nochaos.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx
index 4d49203134..e90bb066ef 100644
--- a/sfx2/source/inc/objmnctl.hxx
+++ b/sfx2/source/inc/objmnctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objmnctl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 8ee3b79a6f..61fdf74488 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.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: objshimp.hxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/openflag.hxx b/sfx2/source/inc/openflag.hxx
index e77699cdee..5b719095ea 100644
--- a/sfx2/source/inc/openflag.hxx
+++ b/sfx2/source/inc/openflag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: openflag.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx
index 0e2b7173a0..8487199da0 100644
--- a/sfx2/source/inc/ownsubfilterservice.hxx
+++ b/sfx2/source/inc/ownsubfilterservice.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ownsubfilterservice.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 5ed45b420a..d4f5eb987e 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: partwnd.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index 6c545e2fb2..8f0e57a419 100644
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: plugin.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index bd5aa42e55..8ff8652e55 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: preview.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index f056c66407..aafe7be820 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recfloat.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/referers.hxx b/sfx2/source/inc/referers.hxx
index 921b4cbf26..77efdf5cd0 100644
--- a/sfx2/source/inc/referers.hxx
+++ b/sfx2/source/inc/referers.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: referers.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 0c0c8a4250..802101a745 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxlocal.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 5097112f6a..4b366cc7fa 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxpicklist.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 5524a9093c..a11aeedf88 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxtypes.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 8efe390558..8acc674b35 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxurlrelocator.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index be428d898b..4eceef348e 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: slotserv.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/speakerdlg.hxx b/sfx2/source/inc/speakerdlg.hxx
index e3af356b45..92ca3d78ef 100644
--- a/sfx2/source/inc/speakerdlg.hxx
+++ b/sfx2/source/inc/speakerdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: speakerdlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index b1fe78e1a9..00b20fb785 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitwin.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 630b4b6ee6..58050d334a 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: statcach.hxx,v $
- * $Revision: 1.10.180.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 55e7a317d2..e6e1199e7a 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.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: templdgi.hxx,v $
- * $Revision: 1.18.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index 82ef3edd69..953ce16eb6 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplcitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/tplcomp.hxx b/sfx2/source/inc/tplcomp.hxx
index 27951183da..e461a2de7a 100644
--- a/sfx2/source/inc/tplcomp.hxx
+++ b/sfx2/source/inc/tplcomp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplcomp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 96fb175769..0cec195d73 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: versdlg.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 5e2436db51..a67afa4a97 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: virtmenu.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index dc231c1af7..d56f5a371a 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: workwin.hxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 895b1e7523..d0c13b6121 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.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: inettbc.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inet/makefile.mk b/sfx2/source/inet/makefile.mk
index 0460834fdd..a98be158a7 100644
--- a/sfx2/source/inet/makefile.mk
+++ b/sfx2/source/inet/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/layout/factory.cxx b/sfx2/source/layout/factory.cxx
index fa5c99e031..e572ffb2b7 100644
--- a/sfx2/source/layout/factory.cxx
+++ b/sfx2/source/layout/factory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabdlg.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
index 24caa81ac6..3ea9cbcb84 100644
--- a/sfx2/source/layout/makefile.mk
+++ b/sfx2/source/layout/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/sfx2/source/layout/sfxdialog.cxx b/sfx2/source/layout/sfxdialog.cxx
index ebd28de8e6..f3a76c489b 100644
--- a/sfx2/source/layout/sfxdialog.cxx
+++ b/sfx2/source/layout/sfxdialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabdlg.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index bf7c521ade..fefcb7cef1 100644
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabdlg.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx
index 767cb14dfa..7df739a38b 100644
--- a/sfx2/source/layout/sfxtabpage.cxx
+++ b/sfx2/source/layout/sfxtabpage.cxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 #include <sfx2/layout.hxx>
 
diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
index 57a02ceef9..769864bb1f 100644
--- a/sfx2/source/menu/makefile.mk
+++ b/sfx2/source/menu/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc
index f9bab4e599..772cc7b143 100644
--- a/sfx2/source/menu/menu.hrc
+++ b/sfx2/source/menu/menu.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menu.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src
index 61bb39972b..97c9c7f640 100644
--- a/sfx2/source/menu/menu.src
+++ b/sfx2/source/menu/menu.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: menu.src,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 804db9fa39..ccf2edc63f 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mnuitem.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 4530277451..9cff2cb9cb 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.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: mnumgr.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index 27b500d7ff..a5419f6487 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objmnctl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index b9fca30a80..d577ab82a4 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: virtmenu.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 933581c7fd..7bb8a81d1b 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventsupplier.cxx,v $
- * $Revision: 1.36.12.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 9b8d8885c6..647864c2de 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hintpost.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/notify/makefile.mk b/sfx2/source/notify/makefile.mk
index b63d4f16ae..edea2f5ee7 100644
--- a/sfx2/source/notify/makefile.mk
+++ b/sfx2/source/notify/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk
index b5c4f1f5fb..d1f5a09343 100644
--- a/sfx2/source/statbar/makefile.mk
+++ b/sfx2/source/statbar/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 6ceb8803de..6546cb9d17 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stbitem.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index f69afa02fc..9084f5f98f 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imgmgr.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/toolbox/makefile.mk b/sfx2/source/toolbox/makefile.mk
index bedc92c424..9b454d1ea8 100644
--- a/sfx2/source/toolbox/makefile.mk
+++ b/sfx2/source/toolbox/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f0efa2da90..670e4b7f50 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxitem.cxx,v $
- * $Revision: 1.70.80.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index e5d7ca0693..22a9cd8f63 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frame.cxx,v $
- * $Revision: 1.55.142.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index cab7101731..9a481ab7d0 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmload.cxx,v $
- * $Revision: 1.90 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/impframe.cxx b/sfx2/source/view/impframe.cxx
index 5c22507979..3bc2d7f203 100644
--- a/sfx2/source/view/impframe.cxx
+++ b/sfx2/source/view/impframe.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impframe.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index de5995dfb8..95a977024c 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impframe.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 18fe96ebb0..a0cd213843 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ipclient.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
index 98d34215e0..1352928905 100644
--- a/sfx2/source/view/makefile.mk
+++ b/sfx2/source/view/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.20 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index ede50724b4..c509275036 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: orgmgr.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index ec782c1750..175273394e 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: printer.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index 899b082c89..4d6e436ceb 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prnmon.cxx,v $
- * $Revision: 1.25.46.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 5a64421423..cd6cf7faae 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sfxbasecontroller.cxx,v $
- * $Revision: 1.76 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index bf88a5775d..9958ccdfb2 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: topfrm.cxx,v $
- * $Revision: 1.97 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index ac3740dce4..e716e604b6 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: userinputinterception.cxx,v $
-*
-* $Revision: 1.2 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 47229be67c..783463344f 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: view.hrc,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/view.hxx b/sfx2/source/view/view.hxx
index bfad2d2431..20e542d90b 100644
--- a/sfx2/source/view/view.hxx
+++ b/sfx2/source/view/view.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: view.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 45f0ef949b..5ec34f9763 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: view.src,v $
- * $Revision: 1.55 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 09ef5d2e1f..0e521c7b04 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewfac.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 8f406833a5..2dcd93c6b6 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewfrm.cxx,v $
- * $Revision: 1.136.8.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 6b0c77071c..6934d4f246 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewimp.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 0f1ae3d110..7543a0d790 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewprn.cxx,v $
- * $Revision: 1.36.84.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index a16439698e..5e56e20746 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewsh.cxx,v $
- * $Revision: 1.82.98.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index 004221203a..3ef75a413b 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index 10b70b1a13..045bcd99a3 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/util/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.54 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/util/makefile.pmk b/sfx2/util/makefile.pmk
index 2e0009b87e..5d566dc20b 100644
--- a/sfx2/util/makefile.pmk
+++ b/sfx2/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index 1c0ec1ad15..0d2465004e 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basereader.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -50,7 +47,7 @@ public:
 protected: // protected because its only an implementation relevant class
     CBaseReader( const std::string& DocumentName );
 
-    CBaseReader( void* stream, zlib_filefunc_def* fa );

+    CBaseReader( void* stream, zlib_filefunc_def* fa );
 
     virtual void start_document();
     
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx
index 90f154ce6a..7c327d5a09 100644
--- a/shell/inc/internal/columninfo.hxx
+++ b/shell/inc/internal/columninfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: columninfo.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index caf33f39a3..3c10e7db26 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: config.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index 37a0a474f6..174a6e4e1b 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contentreader.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,7 +40,7 @@ public:
     //CContentReader( const std::string& DocumentName );
     CContentReader( const std::string& DocumentName, LocaleSet_t const & DocumentLocale );
 
-    CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );

+    CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );
 
 
     /** Get the chunkbuffer.
diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx
index 82ffafd704..fbab023664 100644
--- a/shell/inc/internal/dbgmacros.hxx
+++ b/shell/inc/internal/dbgmacros.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbgmacros.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
index 4afbf87daa..fee6b0045d 100644
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fileextensions.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index ab275c22b8..58d7de749d 100644
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: global.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx
index 48e1cbc0ab..e397b9ecfb 100644
--- a/shell/inc/internal/i_xml_parser_event_handler.hxx
+++ b/shell/inc/internal/i_xml_parser_event_handler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: i_xml_parser_event_handler.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx
index 857f980bfb..a39e67ce7d 100644
--- a/shell/inc/internal/infotips.hxx
+++ b/shell/inc/internal/infotips.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: infotips.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/iso8601_converter.hxx b/shell/inc/internal/iso8601_converter.hxx
index d2b70b42ed..f7f00bbe1c 100644
--- a/shell/inc/internal/iso8601_converter.hxx
+++ b/shell/inc/internal/iso8601_converter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iso8601_converter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index 3a494cd34b..a0bf7a3478 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: metainforeader.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,7 +43,7 @@ public:
 
     CMetaInfoReader( const std::string& DocumentName );
 
-    CMetaInfoReader( void* stream, zlib_filefunc_def* fa);

+    CMetaInfoReader( void* stream, zlib_filefunc_def* fa);
 
     /** check if the Tag is in the target meta.xml file.
 
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx
index ec3457522c..07f5b796f4 100644
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/internal/propsheets.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propsheets.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/registry.hxx b/shell/inc/internal/registry.hxx
index 76aba703d1..6dc531f955 100644
--- a/shell/inc/internal/registry.hxx
+++ b/shell/inc/internal/registry.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: registry.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx
index 0806d9df6e..aee82fc542 100644
--- a/shell/inc/internal/shlxthdl.hxx
+++ b/shell/inc/internal/shlxthdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shlxthdl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index 32334ee40a..27f7adbec2 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thumbviewer.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 7de20446f7..c11692912a 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: types.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -36,8 +33,8 @@
 #include <utility>
 #include <vector>
 #include <stack>
-#include <external/zlib/zlib.h>

-#include <external/zlib/ioapi.h>

+#include <external/zlib/zlib.h>
+#include <external/zlib/ioapi.h>
 
 
 typedef std::vector<std::wstring> StringList_t;
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index aed96260c3..5b44c27855 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: utilities.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 6452d665dc..8cf152794d 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_parser.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 5efbcdf130..399dd34ae2 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zipfile.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,9 +32,9 @@
 #define _WINDOWS
 #endif
 
-

-#include <external/zlib/unzip.h>

-

+
+#include <external/zlib/unzip.h>
+
 
 #include <string>
 #include <vector>
@@ -71,7 +68,7 @@ public:
     */
     static bool IsZipFile(const std::string& FileName);
 
-    static bool IsZipFile(void* stream);

+    static bool IsZipFile(void* stream);
 
     
     /** Returns wheter the version of the specified zip file may be uncompressed with the
@@ -91,7 +88,7 @@ public:
     */
     static bool IsValidZipFileVersionNumber(const std::string& FileName);
         
-    static bool IsValidZipFileVersionNumber(void* stream);

+    static bool IsValidZipFileVersionNumber(void* stream);
 
 public:
     
@@ -109,7 +106,7 @@ public:
     */
     ZipFile(const std::string& FileName);
 
-    ZipFile(void* stream, zlib_filefunc_def* fa);

+    ZipFile(void* stream, zlib_filefunc_def* fa);
 
         
     /** Destroys a zip file
diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk
index ae070770d8..bdcab76a8c 100644
--- a/shell/inc/makefile.mk
+++ b/shell/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/inc/pch/precompiled_shell.cxx b/shell/inc/pch/precompiled_shell.cxx
index 1a2e3ae46c..778ff4e457 100644
--- a/shell/inc/pch/precompiled_shell.cxx
+++ b/shell/inc/pch/precompiled_shell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_shell.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/inc/pch/precompiled_shell.hxx b/shell/inc/pch/precompiled_shell.hxx
index 7f22a98298..a3ea4e27b4 100644
--- a/shell/inc/pch/precompiled_shell.hxx
+++ b/shell/inc/pch/precompiled_shell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_shell.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx
index e6a0de16a1..920ee636c4 100644
--- a/shell/qa/i_xml_parser_event_handler.hxx
+++ b/shell/qa/i_xml_parser_event_handler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: i_xml_parser_event_handler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index 70c42e6463..85a4a41f8c 100755..100644
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index 40a0d92eac..211d5a53d2 100755..100644
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recent_docs.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 623aad6d69..d42d1a9a1d 100755..100644
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/all/ooofilereader/autostyletag.cxx b/shell/source/all/ooofilereader/autostyletag.cxx
index a334ab3a58..6545ad0330 100644
--- a/shell/source/all/ooofilereader/autostyletag.cxx
+++ b/shell/source/all/ooofilereader/autostyletag.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autostyletag.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/autostyletag.hxx b/shell/source/all/ooofilereader/autostyletag.hxx
index ace48e97b7..c9710e002d 100644
--- a/shell/source/all/ooofilereader/autostyletag.hxx
+++ b/shell/source/all/ooofilereader/autostyletag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autostyletag.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx
index d8d95c3e89..606ab31add 100644
--- a/shell/source/all/ooofilereader/basereader.cxx
+++ b/shell/source/all/ooofilereader/basereader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: basereader.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -50,14 +47,14 @@ m_ZipFile( DocumentName )
 //
 //------------------------------
 
-CBaseReader::CBaseReader(void * sw, zlib_filefunc_def* fa):

-m_ZipFile( sw , fa )

-{

-}

-

-//------------------------------

-//

-//------------------------------

+CBaseReader::CBaseReader(void * sw, zlib_filefunc_def* fa):
+m_ZipFile( sw , fa )
+{
+}
+
+//------------------------------
+//
+//------------------------------
 
 CBaseReader::~CBaseReader()
 {
diff --git a/shell/source/all/ooofilereader/contentreader.cxx b/shell/source/all/ooofilereader/contentreader.cxx
index 138663bf36..4afb278ff2 100644
--- a/shell/source/all/ooofilereader/contentreader.cxx
+++ b/shell/source/all/ooofilereader/contentreader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contentreader.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,27 +58,27 @@ CBaseReader( DocumentName )
     }
 }
 
-CContentReader::CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa ) :

-CBaseReader( stream, fa )

-{

-try

-    {

-        m_DefaultLocale = DocumentLocale;

-        Initialize( DOC_CONTENT_NAME );

-    }

-    catch(xml_parser_exception&

-    #if OSL_DEBUG_LEVEL > 0

-    ex

-    #endif

-    )

-    {

-        ENSURE(false, ex.what());

-    }

-    catch(...)

-    {

-        ENSURE(false, "Unknown error");

-    }

-}

+CContentReader::CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa ) :
+CBaseReader( stream, fa )
+{
+try
+    {
+        m_DefaultLocale = DocumentLocale;
+        Initialize( DOC_CONTENT_NAME );
+    }
+    catch(xml_parser_exception&
+    #if OSL_DEBUG_LEVEL > 0
+    ex
+    #endif
+    )
+    {
+        ENSURE(false, ex.what());
+    }
+    catch(...)
+    {
+        ENSURE(false, "Unknown error");
+    }
+}
 
 
 /** destructor.
diff --git a/shell/source/all/ooofilereader/dummytag.hxx b/shell/source/all/ooofilereader/dummytag.hxx
index ce5c02b7b6..f417dc0595 100644
--- a/shell/source/all/ooofilereader/dummytag.hxx
+++ b/shell/source/all/ooofilereader/dummytag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dummytag.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/itag.hxx b/shell/source/all/ooofilereader/itag.hxx
index 1b5cc76910..97c09ed35b 100644
--- a/shell/source/all/ooofilereader/itag.hxx
+++ b/shell/source/all/ooofilereader/itag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itag.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/keywordstag.cxx b/shell/source/all/ooofilereader/keywordstag.cxx
index aaddfe8166..85d691ca42 100644
--- a/shell/source/all/ooofilereader/keywordstag.cxx
+++ b/shell/source/all/ooofilereader/keywordstag.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: keywordstag.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/keywordstag.hxx b/shell/source/all/ooofilereader/keywordstag.hxx
index 54cd89c041..53f85799cc 100644
--- a/shell/source/all/ooofilereader/keywordstag.hxx
+++ b/shell/source/all/ooofilereader/keywordstag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: keywordstag.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index b893db45d8..c0e5a43ef6 100644
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/all/ooofilereader/metainforeader.cxx b/shell/source/all/ooofilereader/metainforeader.cxx
index e179d9ab14..24e59f6845 100644
--- a/shell/source/all/ooofilereader/metainforeader.cxx
+++ b/shell/source/all/ooofilereader/metainforeader.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: metainforeader.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -80,48 +77,48 @@ CBaseReader( DocumentName )
     }
 }
 
-CMetaInfoReader::CMetaInfoReader( void* stream, zlib_filefunc_def* fa) :

-CBaseReader( stream, fa)

-{

-try

-    {

-        m_pKeywords_Builder = new CKeywordsTag( );

-        m_pSimple_Builder = new CSimpleTag( );

-        m_pDummy_Builder   = new CDummyTag( );

-

-        //retrieve all infomation that is useful

-        m_AllMetaInfo[META_INFO_AUTHOR]               = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_TITLE]                = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_SUBJECT]              = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_KEYWORDS]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_DESCRIPTION]          = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_DOCUMENT_STATISTIC]   = EMPTY_XML_TAG;

-

-        m_AllMetaInfo[META_INFO_GENERATOR]            = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_CREATION]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_CREATOR]              = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_MODIFIED]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_LANGUAGE]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_DOCUMENT_NUMBER]      = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_EDITING_TIME]         = EMPTY_XML_TAG;

-

-        Initialize( META_CONTENT_NAME );

-    }

-    catch(xml_parser_exception&

-    #if OSL_DEBUG_LEVEL > 0

-    ex

-    #endif

-    )

-    {

-        ENSURE(false, ex.what());

-    }

-    catch(...)

-    {

-        ENSURE(false, "Unknown error");

-    }

-

-}

-

+CMetaInfoReader::CMetaInfoReader( void* stream, zlib_filefunc_def* fa) :
+CBaseReader( stream, fa)
+{
+try
+    {
+        m_pKeywords_Builder = new CKeywordsTag( );
+        m_pSimple_Builder = new CSimpleTag( );
+        m_pDummy_Builder   = new CDummyTag( );
+
+        //retrieve all infomation that is useful
+        m_AllMetaInfo[META_INFO_AUTHOR]               = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_TITLE]                = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_SUBJECT]              = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_KEYWORDS]             = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_DESCRIPTION]          = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_DOCUMENT_STATISTIC]   = EMPTY_XML_TAG;
+
+        m_AllMetaInfo[META_INFO_GENERATOR]            = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_CREATION]             = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_CREATOR]              = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_MODIFIED]             = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_LANGUAGE]             = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_DOCUMENT_NUMBER]      = EMPTY_XML_TAG;
+        m_AllMetaInfo[META_INFO_EDITING_TIME]         = EMPTY_XML_TAG;
+
+        Initialize( META_CONTENT_NAME );
+    }
+    catch(xml_parser_exception&
+    #if OSL_DEBUG_LEVEL > 0
+    ex
+    #endif
+    )
+    {
+        ENSURE(false, ex.what());
+    }
+    catch(...)
+    {
+        ENSURE(false, "Unknown error");
+    }
+
+}
+
 /** destructor.
 */
 
diff --git a/shell/source/all/ooofilereader/simpletag.cxx b/shell/source/all/ooofilereader/simpletag.cxx
index a4b90f9358..00e0dfff9d 100644
--- a/shell/source/all/ooofilereader/simpletag.cxx
+++ b/shell/source/all/ooofilereader/simpletag.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletag.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/ooofilereader/simpletag.hxx b/shell/source/all/ooofilereader/simpletag.hxx
index f88af69614..1a06c2a77f 100644
--- a/shell/source/all/ooofilereader/simpletag.hxx
+++ b/shell/source/all/ooofilereader/simpletag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simpletag.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 5dcb351682..67b445c3d4 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_parser.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/zipfile/makefile.mk b/shell/source/all/zipfile/makefile.mk
index 9f294ce7aa..8a22919db0 100644
--- a/shell/source/all/zipfile/makefile.mk
+++ b/shell/source/all/zipfile/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -33,7 +29,7 @@ PRJ=..$/..$/..
 PRJNAME=shell
 TARGET=zipfile
 ENABLE_EXCEPTIONS=TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE

+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 
 
diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx
index 7a270dd3e8..f5d4a3dd77 100644
--- a/shell/source/all/zipfile/zipexcptn.cxx
+++ b/shell/source/all/zipfile/zipexcptn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zipexcptn.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx
index d5b6ef6e06..7512c50dac 100644
--- a/shell/source/all/zipfile/zipfile.cxx
+++ b/shell/source/all/zipfile/zipfile.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zipfile.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -79,10 +76,10 @@ bool ZipFile::IsZipFile(const std::string& /*FileName*/)
     return true;
 }
 
-bool ZipFile::IsZipFile(void* /*stream*/)

-{

-    return true;

-}

+bool ZipFile::IsZipFile(void* /*stream*/)
+{
+    return true;
+}
 
 
 /** Returns wheter the version of the specified zip file may be uncompressed with the
@@ -105,10 +102,10 @@ bool ZipFile::IsValidZipFileVersionNumber(const std::string& /*FileName*/)
     return true;
 }
 
-bool ZipFile::IsValidZipFileVersionNumber(void* /* stream*/)

-{

-    return true;

-}

+bool ZipFile::IsValidZipFileVersionNumber(void* /* stream*/)
+{
+    return true;
+}
 
 
 /** Constructs a zip file from a zip file
@@ -131,14 +128,14 @@ ZipFile::ZipFile(const std::string& FileName)
         throw IOException(-1);
 }
 
-ZipFile::ZipFile(void* stream, zlib_filefunc_def* fa) 

-{

-    fa->opaque = stream;

-    m_uzFile = unzOpen2((const char *)NULL, fa);

-

-    if (0 == m_uzFile)

-        throw IOException(-1);

-}

+ZipFile::ZipFile(void* stream, zlib_filefunc_def* fa) 
+{
+    fa->opaque = stream;
+    m_uzFile = unzOpen2((const char *)NULL, fa);
+
+    if (0 == m_uzFile)
+        throw IOException(-1);
+}
 
 
 /** Destroys a zip file
diff --git a/shell/source/aqua/sysshell/makefile.mk b/shell/source/aqua/sysshell/makefile.mk
index b3cf3abdec..665f56455a 100644
--- a/shell/source/aqua/sysshell/makefile.mk
+++ b/shell/source/aqua/sysshell/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/aqua/sysshell/systemshell.cxx b/shell/source/aqua/sysshell/systemshell.cxx
index 11d02aa921..4b798ce484 100644
--- a/shell/source/aqua/sysshell/systemshell.cxx
+++ b/shell/source/aqua/sysshell/systemshell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: systemshell.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/desktopbe/desktopbecdef.cxx b/shell/source/backends/desktopbe/desktopbecdef.cxx
index 3d668c53dc..1ea7134015 100644
--- a/shell/source/backends/desktopbe/desktopbecdef.cxx
+++ b/shell/source/backends/desktopbe/desktopbecdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: desktopbecdef.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk
index b6bcd3d959..d7df35d8c1 100644
--- a/shell/source/backends/desktopbe/makefile.mk
+++ b/shell/source/backends/desktopbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index d5ae5915b2..abeaa91f69 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gconfbackend.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/gconfbe/gconfbackend.hxx b/shell/source/backends/gconfbe/gconfbackend.hxx
index 2177eb99b6..703d7c2b51 100644
--- a/shell/source/backends/gconfbe/gconfbackend.hxx
+++ b/shell/source/backends/gconfbe/gconfbackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gconfbackend.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/gconfbe/gconfbecdef.cxx b/shell/source/backends/gconfbe/gconfbecdef.cxx
index 54faf1caeb..1d667dcc22 100644
--- a/shell/source/backends/gconfbe/gconfbecdef.cxx
+++ b/shell/source/backends/gconfbe/gconfbecdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gconfbecdef.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/gconfbe/gconflayer.cxx b/shell/source/backends/gconfbe/gconflayer.cxx
index f6ad4fe776..545e43d636 100644
--- a/shell/source/backends/gconfbe/gconflayer.cxx
+++ b/shell/source/backends/gconfbe/gconflayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gconflayer.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk
index 472db4b244..d1aefef25d 100644
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.19 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/gconfbe/orbit.h b/shell/source/backends/gconfbe/orbit.h
index 1707e46166..2858e8100d 100644
--- a/shell/source/backends/gconfbe/orbit.h
+++ b/shell/source/backends/gconfbe/orbit.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: orbit.h,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 3e0fadd682..4f60f07098 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4backend.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4backend.hxx b/shell/source/backends/kde4be/kde4backend.hxx
index 95f66f325a..37b88de3be 100644
--- a/shell/source/backends/kde4be/kde4backend.hxx
+++ b/shell/source/backends/kde4be/kde4backend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4backend.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4becdef.cxx b/shell/source/backends/kde4be/kde4becdef.cxx
index 277e3910b7..755b69a4f2 100644
--- a/shell/source/backends/kde4be/kde4becdef.cxx
+++ b/shell/source/backends/kde4be/kde4becdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4becdef.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4commonlayer.cxx b/shell/source/backends/kde4be/kde4commonlayer.cxx
index 6e718cbddb..2b1d599e24 100644
--- a/shell/source/backends/kde4be/kde4commonlayer.cxx
+++ b/shell/source/backends/kde4be/kde4commonlayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4commonlayer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4inetlayer.cxx b/shell/source/backends/kde4be/kde4inetlayer.cxx
index 968121b025..189489009c 100644
--- a/shell/source/backends/kde4be/kde4inetlayer.cxx
+++ b/shell/source/backends/kde4be/kde4inetlayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4inetlayer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4pathslayer.cxx b/shell/source/backends/kde4be/kde4pathslayer.cxx
index 079179062c..425949482e 100644
--- a/shell/source/backends/kde4be/kde4pathslayer.cxx
+++ b/shell/source/backends/kde4be/kde4pathslayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4pathslayer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4pathslayer.hxx b/shell/source/backends/kde4be/kde4pathslayer.hxx
index e3fc4dcadc..83ee07b658 100644
--- a/shell/source/backends/kde4be/kde4pathslayer.hxx
+++ b/shell/source/backends/kde4be/kde4pathslayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4pathslayer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/kde4vcllayer.cxx b/shell/source/backends/kde4be/kde4vcllayer.cxx
index 2705cb64e9..0aa07b94bf 100644
--- a/shell/source/backends/kde4be/kde4vcllayer.cxx
+++ b/shell/source/backends/kde4be/kde4vcllayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kde4vcllayer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk
index 6f92762e5a..d7c6d76139 100644
--- a/shell/source/backends/kde4be/makefile.mk
+++ b/shell/source/backends/kde4be/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index ecf1715d0e..56bd536fdf 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdebackend.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdebackend.hxx b/shell/source/backends/kdebe/kdebackend.hxx
index 5305c4414a..2af9fdef0d 100644
--- a/shell/source/backends/kdebe/kdebackend.hxx
+++ b/shell/source/backends/kdebe/kdebackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdebackend.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdebecdef.cxx b/shell/source/backends/kdebe/kdebecdef.cxx
index 026bffa7c1..140d4de556 100644
--- a/shell/source/backends/kdebe/kdebecdef.cxx
+++ b/shell/source/backends/kdebe/kdebecdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdebecdef.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdecommonlayer.cxx b/shell/source/backends/kdebe/kdecommonlayer.cxx
index d770c87013..5c69c94a46 100644
--- a/shell/source/backends/kdebe/kdecommonlayer.cxx
+++ b/shell/source/backends/kdebe/kdecommonlayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdecommonlayer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdeinetlayer.cxx b/shell/source/backends/kdebe/kdeinetlayer.cxx
index 476baec070..90161a1f21 100644
--- a/shell/source/backends/kdebe/kdeinetlayer.cxx
+++ b/shell/source/backends/kdebe/kdeinetlayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdeinetlayer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx
index dd622f1bc0..7b39a0fc52 100644
--- a/shell/source/backends/kdebe/kdepathslayer.cxx
+++ b/shell/source/backends/kdebe/kdepathslayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdepathslayer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdepathslayer.hxx b/shell/source/backends/kdebe/kdepathslayer.hxx
index fe882064ee..c2b6872e6b 100644
--- a/shell/source/backends/kdebe/kdepathslayer.hxx
+++ b/shell/source/backends/kdebe/kdepathslayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdepathslayer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/kdevcllayer.cxx b/shell/source/backends/kdebe/kdevcllayer.cxx
index e2373e08a2..4721e17920 100644
--- a/shell/source/backends/kdebe/kdevcllayer.cxx
+++ b/shell/source/backends/kdebe/kdevcllayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kdevcllayer.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk
index 8bc0b475be..cc63ee33cf 100644
--- a/shell/source/backends/kdebe/makefile.mk
+++ b/shell/source/backends/kdebe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 56094892f0..d3b4288f40 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localebackend.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx
index eedce52b89..eec90af56d 100644
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localebackend.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index 668187b1ee..ba1439b7d8 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localebecdef.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/localebe/localelayer.cxx b/shell/source/backends/localebe/localelayer.cxx
index 9d30723b3f..a7f8e9a743 100644
--- a/shell/source/backends/localebe/localelayer.cxx
+++ b/shell/source/backends/localebe/localelayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: localelayer.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk
index 76767264a8..13a885f658 100644
--- a/shell/source/backends/localebe/makefile.mk
+++ b/shell/source/backends/localebe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index 53f64ea663..499696cea5 100644
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macbackend.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index ed5aed163f..5c477d1a73 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macbackend.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index bf9ee9d7bd..82fae97dbd 100644
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macbecdef.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/macbe/macbelayer.cxx b/shell/source/backends/macbe/macbelayer.cxx
index 2204677037..fd31abe7e3 100644
--- a/shell/source/backends/macbe/macbelayer.cxx
+++ b/shell/source/backends/macbe/macbelayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macbelayer.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/macbe/macbelayer.hxx b/shell/source/backends/macbe/macbelayer.hxx
index 84ab493436..e57d5e6434 100644
--- a/shell/source/backends/macbe/macbelayer.hxx
+++ b/shell/source/backends/macbe/macbelayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macbelayer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk
index c8f6891d6f..abef47bf30 100644
--- a/shell/source/backends/macbe/makefile.mk
+++ b/shell/source/backends/macbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk
index be43ecaded..9b75e61051 100644
--- a/shell/source/backends/wininetbe/makefile.mk
+++ b/shell/source/backends/wininetbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 775d39a8d3..22b2eecbd3 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wininetbackend.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx
index 865872ecc0..d98f68d3b2 100644
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wininetbackend.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index a5902c3f6b..8f507a30e0 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wininetbecdef.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/backends/wininetbe/wininetlayer.cxx b/shell/source/backends/wininetbe/wininetlayer.cxx
index 0151eb5550..8830ecd6d8 100644
--- a/shell/source/backends/wininetbe/wininetlayer.cxx
+++ b/shell/source/backends/wininetbe/wininetlayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wininetlayer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 0934a6e034..02e1d4137a 100755..100644
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdmailentry.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index e6787be2fc..1b4a789a49 100755..100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdmailmsg.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index db5817d35b..88c2f6af99 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdmailmsg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index dc31693138..0e33d2fa85 100755..100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdmailsuppl.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index 3d4ff311a4..e4e158330b 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdmailsuppl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk
index 6b83d74842..5f082397d5 100644
--- a/shell/source/cmdmail/makefile.mk
+++ b/shell/source/cmdmail/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx
index e8c5ead776..0238df7557 100644
--- a/shell/source/tools/lngconvex/cmdline.cxx
+++ b/shell/source/tools/lngconvex/cmdline.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmdline.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 927e626a48..c63aba0b9e 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lngconvex.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index c98f5d4796..6852256595 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/tools/regsvrex/makefile.mk b/shell/source/tools/regsvrex/makefile.mk
index 52c6ee70b6..1fa68cf556 100644
--- a/shell/source/tools/regsvrex/makefile.mk
+++ b/shell/source/tools/regsvrex/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx
index 51a188ac1b..12942a3840 100644
--- a/shell/source/tools/regsvrex/regsvrex.cxx
+++ b/shell/source/tools/regsvrex/regsvrex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: regsvrex.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index e23e249e08..425c8d7575 100644
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 6e635f8cd0..5f584ab426 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shellexec.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index 7ea66909b9..4b8bc2bf39 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shellexec.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index 5ef8c34651..1c0c884bc0 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shellexecentry.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx
index fc46d331b5..03cb276f48 100644
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/urltest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: urltest.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c
index 891edc630b..783765dadc 100644
--- a/shell/source/unix/misc/gnome-open-url.c
+++ b/shell/source/unix/misc/gnome-open-url.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gnome-open-url.c,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 8a5ee36622..39310f845d 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/unix/misc/open-url.c b/shell/source/unix/misc/open-url.c
index 32c7503344..5a29e4da46 100644
--- a/shell/source/unix/misc/open-url.c
+++ b/shell/source/unix/misc/open-url.c
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/shell/source/unix/misc/senddoc.c b/shell/source/unix/misc/senddoc.c
index 3de1b6118f..d1413622b7 100644
--- a/shell/source/unix/misc/senddoc.c
+++ b/shell/source/unix/misc/senddoc.c
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * 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
  *
diff --git a/shell/source/unix/misc/uri-encode.c b/shell/source/unix/misc/uri-encode.c
index 5354cfd936..e93bd61e66 100644
--- a/shell/source/unix/misc/uri-encode.c
+++ b/shell/source/unix/misc/uri-encode.c
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uri-encode.c,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 2c1ace9fe1..f2b2489cd8 100644
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 9763ea8417..95989204db 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recently_used_file.cxx,v $
- * $Revision: 1.7.30.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index 596f047d83..5e67212dd0 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recently_used_file.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index d468a507a3..704e7664e6 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recently_used_file_handler.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 35e68a3a04..caa21044de 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SysShExec.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 2ed0a3bb3d..a3d83c4377 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SysShExec.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index 0e2549615d..bbc98ca00b 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SysShentry.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk
index 04cc45d89b..f04c4d3c31 100644
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index a7b729d03a..9afad56fff 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: classfactory.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index 3c85c4e8e6..74245cfe9b 100644
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: classfactory.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 9d65114714..042d366963 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: columninfo.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index 0b25d470aa..2c236fc6c3 100644
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 4ebe4c642a..2ea4835636 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: infotips.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index cf489f3232..d6a93ce2b8 100644
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 479f8c0b6c..0c8a99a829 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/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.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 22127bc8dd..9cf92b71fa 100644
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index f907306e99..94ee73c527 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ooofilt.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -78,8 +75,8 @@
 #include <ntquery.h>
 #include "assert.h"
 #include "ooofilt.hxx"
-#include <objidl.h>

-#include <stdio.h>

+#include <objidl.h>
+#include <stdio.h>
 #include "propspec.hxx"
 #ifdef __MINGW32__
 #include <algorithm>
@@ -120,7 +117,7 @@ COooFilter::COooFilter() :
     m_ChunkPosition(0),
     m_cAttributes(0),
     m_pAttributes(0),
-    m_pStream(NULL)

+    m_pStream(NULL)
 
 {
     InterlockedIncrement( &g_lInstances );
@@ -176,8 +173,8 @@ SCODE STDMETHODCALLTYPE COooFilter::QueryInterface(
         pUnkTemp = (IUnknown *)(IPersistFile *)this;
     else if ( IID_IPersist == riid )
         pUnkTemp = (IUnknown *)(IPersist *)(IPersistFile *)this;
-    else if (IID_IPersistStream == riid)

-        pUnkTemp = (IUnknown *)(IPersistStream *)this;

+    else if (IID_IPersistStream == riid)
+        pUnkTemp = (IUnknown *)(IPersistStream *)this;
     else if ( IID_IUnknown == riid )
         pUnkTemp = (IUnknown *)(IPersist *)(IPersistFile *)this;
     else
@@ -720,99 +717,99 @@ SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/)
     return S_OK;
 }
 
-//M-------------------------------------------------------------------------

-//

-//  Method:     COooFilter::Load      (IPersistStream::Load)

-//

-//  Summary:    Initializes an object from the stream where it was previously saved

-//

-//  Arguments:  pStm

-//                  [in] Pointer to stream from which object should be loaded

-//                    

-//

-//  Returns:    S_OK

-//				E_OUTOFMEMORY

-//				E_FAIL

-//                 

-//

-//--------------------------------------------------------------------------

-SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)

-{

-

-    // These next few lines work around the "Seek pointer" bug found on Vista.

-    

-    char buf[20];

-    unsigned long count;

-    HRESULT hr;

-    ULARGE_INTEGER NewPosition;

-    LARGE_INTEGER Move;	

-    Move.QuadPart = 0;	

-    hr = pStm->Seek (Move, STREAM_SEEK_SET, &NewPosition);	

-    hr = pStm->Read (buf, 20, &count);

-                

-    zlib_filefunc_def z_filefunc;

-    fill_stream_filefunc (&z_filefunc);

-    z_filefunc.opaque = (void*)pStm;

-

-    m_pStream = pStm;

-  

-    try

-    {

-        if (m_pMetaInfoReader)

-            delete m_pMetaInfoReader;             

-        m_pMetaInfoReader = new CMetaInfoReader((void*)m_pStream, &z_filefunc);

-        

-        if (m_pContentReader)

-            delete m_pContentReader;

-        m_pContentReader = new CContentReader((void*)m_pStream, m_pMetaInfoReader->getDefaultLocale(), &z_filefunc);

-    }

-    catch (const std::exception&)

-    {

-        return E_FAIL;

-    }

-    return S_OK;

-}

-

-//M-------------------------------------------------------------------------

-//

-//  Method:     COooFilter::GetSizeMax      (IPersistStream::GetSizeMax)

-//

-//  Summary:    Returns the size in bytes of the stream neede to save the object.

-//

-//  Arguments:  pcbSize

-//                  [out] Pointer to a 64 bit unsigned int indicating the size needed 

-//

-//  Returns:    E_NOTIMPL

-//                  

-//

-//--------------------------------------------------------------------------

-SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)

-{

-    // 

-    return E_NOTIMPL;

-}

-

-//M-------------------------------------------------------------------------

-//

-//  Method:     COooFilter::Save      (IPersistStream::Save)

-//

-//  Summary:    Save object to specified stream

-//

-//  Arguments:  pStm

-//                  [in] Pointer to stream

-//

-//              fClearDirty

-//					[in] Indicates whether to clear dirty flag

-//				

-//  Returns:    E_NOTIMPL

-//                 

-//

-//--------------------------------------------------------------------------

-SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )

-{

-    // 

-    return E_NOTIMPL;

-}

+//M-------------------------------------------------------------------------
+//
+//  Method:     COooFilter::Load      (IPersistStream::Load)
+//
+//  Summary:    Initializes an object from the stream where it was previously saved
+//
+//  Arguments:  pStm
+//                  [in] Pointer to stream from which object should be loaded
+//                    
+//
+//  Returns:    S_OK
+//				E_OUTOFMEMORY
+//				E_FAIL
+//                 
+//
+//--------------------------------------------------------------------------
+SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
+{
+
+    // These next few lines work around the "Seek pointer" bug found on Vista.
+    
+    char buf[20];
+    unsigned long count;
+    HRESULT hr;
+    ULARGE_INTEGER NewPosition;
+    LARGE_INTEGER Move;	
+    Move.QuadPart = 0;	
+    hr = pStm->Seek (Move, STREAM_SEEK_SET, &NewPosition);	
+    hr = pStm->Read (buf, 20, &count);
+                
+    zlib_filefunc_def z_filefunc;
+    fill_stream_filefunc (&z_filefunc);
+    z_filefunc.opaque = (void*)pStm;
+
+    m_pStream = pStm;
+  
+    try
+    {
+        if (m_pMetaInfoReader)
+            delete m_pMetaInfoReader;             
+        m_pMetaInfoReader = new CMetaInfoReader((void*)m_pStream, &z_filefunc);
+        
+        if (m_pContentReader)
+            delete m_pContentReader;
+        m_pContentReader = new CContentReader((void*)m_pStream, m_pMetaInfoReader->getDefaultLocale(), &z_filefunc);
+    }
+    catch (const std::exception&)
+    {
+        return E_FAIL;
+    }
+    return S_OK;
+}
+
+//M-------------------------------------------------------------------------
+//
+//  Method:     COooFilter::GetSizeMax      (IPersistStream::GetSizeMax)
+//
+//  Summary:    Returns the size in bytes of the stream neede to save the object.
+//
+//  Arguments:  pcbSize
+//                  [out] Pointer to a 64 bit unsigned int indicating the size needed 
+//
+//  Returns:    E_NOTIMPL
+//                  
+//
+//--------------------------------------------------------------------------
+SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
+{
+    // 
+    return E_NOTIMPL;
+}
+
+//M-------------------------------------------------------------------------
+//
+//  Method:     COooFilter::Save      (IPersistStream::Save)
+//
+//  Summary:    Save object to specified stream
+//
+//  Arguments:  pStm
+//                  [in] Pointer to stream
+//
+//              fClearDirty
+//					[in] Indicates whether to clear dirty flag
+//				
+//  Returns:    E_NOTIMPL
+//                 
+//
+//--------------------------------------------------------------------------
+SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
+{
+    // 
+    return E_NOTIMPL;
+}
 
 //M-------------------------------------------------------------------------
 //
@@ -1247,13 +1244,13 @@ namespace /* private */
         if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
             return E_FAIL;	
 
-        // Add missing entry 

-        std::string ClsidEntry_Persist_Entry = CLSID_PERSIST_ENTRY;

-        SubstitutePlaceholder(ClsidEntry_Persist_Entry, 

-                              GUID_PLACEHOLDER, 

-                              ClsidToString(PersistentGuid));		

-

-        if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist_Entry.c_str(), "", ClsidToString(PersistentGuid).c_str()));

+        // Add missing entry 
+        std::string ClsidEntry_Persist_Entry = CLSID_PERSIST_ENTRY;
+        SubstitutePlaceholder(ClsidEntry_Persist_Entry, 
+                              GUID_PLACEHOLDER, 
+                              ClsidToString(PersistentGuid));		
+
+        if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist_Entry.c_str(), "", ClsidToString(PersistentGuid).c_str()));
 
         
         std::string ClsidEntry_Persist_Addin = CLSID_GUID_PERSIST_ADDIN_ENTRY;
@@ -1505,99 +1502,99 @@ STDAPI DllUnregisterServer()
     return S_OK;
 }
 
-extern "C" {

-

-    // IStream callback

-    voidpf ZCALLBACK cb_sopen (voidpf opaque, const char* filename, int mode) {		

-        return opaque;

-    }

-

-    uLong ZCALLBACK cb_sread (voidpf opaque, voidpf stream, void* buf, uLong size) {

-        unsigned long newsize;

-        HRESULT hr;

-    

-        hr = ((IStream *)stream)->Read (buf, size, &newsize);

-        if (hr == S_OK){

-            return (unsigned long)newsize;

-        }

-        else {			

-            return (uLong)0;

-        }

-    }

-

-    long ZCALLBACK cb_sseek (voidpf opaque, voidpf stream, uLong offset, int origin) {

-        // IStream::Seek parameters

-        HRESULT hr;

-        LARGE_INTEGER Move;

-        DWORD dwOrigin;		

-        Move.QuadPart = (__int64)offset;	

-

-        switch (origin) {

-            case SEEK_CUR:

-                dwOrigin = STREAM_SEEK_CUR;

-                break;

-            case SEEK_END:

-                dwOrigin = STREAM_SEEK_END;

-                break;

-            case SEEK_SET:

-                dwOrigin = STREAM_SEEK_SET;

-                break;

-            default:

-                return -1;

-        }

-    

-        hr = ((IStream*)stream)->Seek (Move, dwOrigin, NULL);

-        if (hr == S_OK){	

-            return 0;

-        }

-        else {			

-            return -1;

-        }

-    }

-

-    long ZCALLBACK cb_stell (voidpf opaque, voidpf stream) {

-        // IStream::Seek parameters

-        HRESULT hr;

-        LARGE_INTEGER Move;

-        ULARGE_INTEGER NewPosition;

-        Move.QuadPart = 0;

-        NewPosition.QuadPart = 0;

-        

-        hr = ((IStream*)stream)->Seek (Move, STREAM_SEEK_CUR, &NewPosition);

-        if (hr == S_OK){			

-            return (long) NewPosition.QuadPart;

-        }

-        else {

-            return -1;

-        }

-    }

-

-    int ZCALLBACK cb_sclose (voidpf opaque, voidpf stream) {

-        return 0;

-    }

-

-    int ZCALLBACK cb_serror (voidpf opaque, voidpf stream) {

-        return 0;  //RJK - for now

-    }

-

-    uLong ZCALLBACK cb_swrite (voidpf opaque, voidpf stream, const void* buf, uLong size) {

-        HRESULT hr;

-        unsigned long writecount;

-        hr = ((IStream*)stream)->Write (buf, size, &writecount);

-        if (hr == S_OK)

-            return (unsigned int)writecount;

-        else

-            return (uLong)0;

-    }

-

-    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def) {

-        pzlib_filefunc_def->zopen_file = cb_sopen;

-        pzlib_filefunc_def->zread_file = cb_sread;

-        pzlib_filefunc_def->zwrite_file = cb_swrite;

-        pzlib_filefunc_def->ztell_file = cb_stell;

-        pzlib_filefunc_def->zseek_file = cb_sseek;

-        pzlib_filefunc_def->zclose_file = cb_sclose;

-        pzlib_filefunc_def->zerror_file = cb_serror;		

-    }

-}

+extern "C" {
+
+    // IStream callback
+    voidpf ZCALLBACK cb_sopen (voidpf opaque, const char* filename, int mode) {		
+        return opaque;
+    }
+
+    uLong ZCALLBACK cb_sread (voidpf opaque, voidpf stream, void* buf, uLong size) {
+        unsigned long newsize;
+        HRESULT hr;
+    
+        hr = ((IStream *)stream)->Read (buf, size, &newsize);
+        if (hr == S_OK){
+            return (unsigned long)newsize;
+        }
+        else {			
+            return (uLong)0;
+        }
+    }
+
+    long ZCALLBACK cb_sseek (voidpf opaque, voidpf stream, uLong offset, int origin) {
+        // IStream::Seek parameters
+        HRESULT hr;
+        LARGE_INTEGER Move;
+        DWORD dwOrigin;		
+        Move.QuadPart = (__int64)offset;	
+
+        switch (origin) {
+            case SEEK_CUR:
+                dwOrigin = STREAM_SEEK_CUR;
+                break;
+            case SEEK_END:
+                dwOrigin = STREAM_SEEK_END;
+                break;
+            case SEEK_SET:
+                dwOrigin = STREAM_SEEK_SET;
+                break;
+            default:
+                return -1;
+        }
+    
+        hr = ((IStream*)stream)->Seek (Move, dwOrigin, NULL);
+        if (hr == S_OK){	
+            return 0;
+        }
+        else {			
+            return -1;
+        }
+    }
+
+    long ZCALLBACK cb_stell (voidpf opaque, voidpf stream) {
+        // IStream::Seek parameters
+        HRESULT hr;
+        LARGE_INTEGER Move;
+        ULARGE_INTEGER NewPosition;
+        Move.QuadPart = 0;
+        NewPosition.QuadPart = 0;
+        
+        hr = ((IStream*)stream)->Seek (Move, STREAM_SEEK_CUR, &NewPosition);
+        if (hr == S_OK){			
+            return (long) NewPosition.QuadPart;
+        }
+        else {
+            return -1;
+        }
+    }
+
+    int ZCALLBACK cb_sclose (voidpf opaque, voidpf stream) {
+        return 0;
+    }
+
+    int ZCALLBACK cb_serror (voidpf opaque, voidpf stream) {
+        return 0;  //RJK - for now
+    }
+
+    uLong ZCALLBACK cb_swrite (voidpf opaque, voidpf stream, const void* buf, uLong size) {
+        HRESULT hr;
+        unsigned long writecount;
+        hr = ((IStream*)stream)->Write (buf, size, &writecount);
+        if (hr == S_OK)
+            return (unsigned int)writecount;
+        else
+            return (uLong)0;
+    }
+
+    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def) {
+        pzlib_filefunc_def->zopen_file = cb_sopen;
+        pzlib_filefunc_def->zread_file = cb_sread;
+        pzlib_filefunc_def->zwrite_file = cb_swrite;
+        pzlib_filefunc_def->ztell_file = cb_stell;
+        pzlib_filefunc_def->zseek_file = cb_sseek;
+        pzlib_filefunc_def->zclose_file = cb_sclose;
+        pzlib_filefunc_def->zerror_file = cb_serror;		
+    }
+}
 
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index f63a9942f5..2b14c8814b 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ooofilt.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -96,7 +93,7 @@ enum FilterState
     FilteringContent,                           // Filtering the content property
     FilteringProperty                           // Filtering the pseudo property
 };
-class COooFilter : public IFilter, public IPersistFile, public IPersistStream

+class COooFilter : public IFilter, public IPersistFile, public IPersistStream
 {
 public:
     // From IUnknown
@@ -143,16 +140,16 @@ public:
     virtual  SCODE STDMETHODCALLTYPE  GetCurFile(
         LPWSTR  * ppszFileName);
 
-    // From IPersistStream

-    virtual SCODE STDMETHODCALLTYPE  Load(

-        IStream *pStm);

-

-    virtual SCODE STDMETHODCALLTYPE Save(

-        IStream *pStm,

-        BOOL fClearDirty);

-

-    virtual SCODE STDMETHODCALLTYPE  GetSizeMax(

-        ULARGE_INTEGER *pcbSize);

+    // From IPersistStream
+    virtual SCODE STDMETHODCALLTYPE  Load(
+        IStream *pStm);
+
+    virtual SCODE STDMETHODCALLTYPE Save(
+        IStream *pStm,
+        BOOL fClearDirty);
+
+    virtual SCODE STDMETHODCALLTYPE  GetSizeMax(
+        ULARGE_INTEGER *pcbSize);
 
 
 private:
@@ -177,7 +174,7 @@ private:
     ULONG			          m_ChunkPosition;          // Chunk pointer to specify the current Chunk;
     ULONG                     m_cAttributes;            // Count of attributes
     CFullPropSpec *           m_pAttributes;            // Attributes to filter
-    IStream *                 m_pStream;

+    IStream *                 m_pStream;
 
 };
 
@@ -220,20 +217,20 @@ private:
     long m_lRefs;           // Reference count
 };
 
-extern "C" {

-

-    voidpf ZCALLBACK cb_sopen OF((voidpf opaque, const char * filename, int mode));

-    uLong ZCALLBACK cb_sread OF((voidpf opaque, voidpf stream, void* vuf, uLong size));

-    uLong ZCALLBACK cb_swrite OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

-    long ZCALLBACK cb_stell OF((voidpf opaque, voidpf stream));

-    long ZCALLBACK cb_sseek OF((voidpf opaque, voidpf stream, uLong offset, int origin));

-    int ZCALLBACK cb_sclose OF((voidpf opaque, voidpf stream));

-    int ZCALLBACK cb_serror OF((voidpf opaque, voidpf stream));

-

-    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def);	

-    

-}

-

+extern "C" {
+
+    voidpf ZCALLBACK cb_sopen OF((voidpf opaque, const char * filename, int mode));
+    uLong ZCALLBACK cb_sread OF((voidpf opaque, voidpf stream, void* vuf, uLong size));
+    uLong ZCALLBACK cb_swrite OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+    long ZCALLBACK cb_stell OF((voidpf opaque, voidpf stream));
+    long ZCALLBACK cb_sseek OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+    int ZCALLBACK cb_sclose OF((voidpf opaque, voidpf stream));
+    int ZCALLBACK cb_serror OF((voidpf opaque, voidpf stream));
+
+    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def);	
+    
+}
+
 
 
 
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index 019cb12d7e..66524f3bbd 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propspec.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index 8c587ed0e3..26c0bd96e8 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propspec.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk
index 54dc3d59a7..8e54efbed0 100644
--- a/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
index 4836eb34bb..34ac1e1736 100644
--- a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ooofiltproxy.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index 2e8bdc5e3a..b10ef5a4aa 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: document_statistic.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 6ef3bfbd67..f1d2f41a5d 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: document_statistic.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 4d4396f06b..668373f8d9 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: listviewbuilder.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
index 15b629cba6..e498fd9703 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: listviewbuilder.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index ac12795cf3..61f359ad6d 100644
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 7172fa8348..838f65797e 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propsheets.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index 8f8c776383..45ba0f84ec 100644
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/res/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 95d7f59d02..026b544273 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shlxthdl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index a7b0b40032..2c47829d1b 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 0c77dc22f3..da415b47fc 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thumbviewer.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
index ca76e8b8c3..503da72b30 100644
--- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx
+++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbgmacros.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index bd6a118b3f..11eb817a37 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fileextensions.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index e9fa5d3cf9..234265aab7 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iso8601_converter.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index c0bec9c36d..a7578d565a 100644
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index f7ade4614f..563c681d41 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: registry.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index eaffd4f023..e330fc7aee 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: utilities.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk
index 70e25f76fe..f13f962785 100644
--- a/shell/source/win32/simplemail/makefile.mk
+++ b/shell/source/win32/simplemail/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 303cb1fb5f..f825b7ad58 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: senddoc.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/simplemapi.cxx b/shell/source/win32/simplemail/simplemapi.cxx
index c0f4a6bdb9..e75daa45d6 100644
--- a/shell/source/win32/simplemail/simplemapi.cxx
+++ b/shell/source/win32/simplemail/simplemapi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simplemapi.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx
index c79e53162f..696944773f 100644
--- a/shell/source/win32/simplemail/simplemapi.hxx
+++ b/shell/source/win32/simplemail/simplemapi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simplemapi.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index ffdc8d4f5d..7d3317cbe2 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailclient.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index 9eae02ae18..eec1f9e03d 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailclient.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index aa8b537d91..2665f2e7ba 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailentry.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index 4f95443ab4..8ba8c82403 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailmsg.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index d2d200f9cc..332fdc60b8 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailmsg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index b81c91e438..40c9a59640 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailsuppl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 6224ca0c7a..4031e76b72 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: smplmailsuppl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index 0e1f16d81b..ed4e59c45b 100644
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TestProxySet.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 82b06c99f9..ce5dd59834 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TestSmplMail.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 179766e9f9..c621688a71 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TestSysShExec.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk
index 2a48f63222..cbcc3dc543 100644
--- a/shell/source/win32/workbench/makefile.mk
+++ b/shell/source/win32/workbench/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/inc/AccessibleSelectionBase.hxx b/svx/inc/AccessibleSelectionBase.hxx
index f2b06e1a57..7ff49cf750 100644
--- a/svx/inc/AccessibleSelectionBase.hxx
+++ b/svx/inc/AccessibleSelectionBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleSelectionBase.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/AccessibleStaticTextBase.hxx b/svx/inc/AccessibleStaticTextBase.hxx
index 2a9fdab114..13ba0be989 100644
--- a/svx/inc/AccessibleStaticTextBase.hxx
+++ b/svx/inc/AccessibleStaticTextBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleStaticTextBase.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -281,282 +278,3 @@ namespace accessibility
 } // end of namespace accessibility
 
 #endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: AccessibleStaticTextBase.hxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
-#define _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
-
-#include <memory>
-#include <tools/gen.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
-#include "svx/svxdllapi.h"
-
-
-class SvxEditSource;
-
-namespace accessibility
-{
-
-    class AccessibleStaticTextBase_Impl;
-
-    typedef ::cppu::ImplHelper2<
-        ::com::sun::star::accessibility::XAccessibleText,
-        ::com::sun::star::accessibility::XAccessibleTextAttributes > AccessibleStaticTextBase_BASE;
-
-    /** Helper class for objects containing EditEngine/Outliner text
-
-        This class implements the XAccessibleText interface for static
-        text, somewhat similar to the children of the
-        AccessibleTextHelper class. Currently, there are no children,
-        i.e. the whole text is presented in one big chunk. This might
-        change in the future, if a need for image bullets should
-        arise. These, by convention, would be represented as children
-        of the text.
-
-        You have to implement the SvxEditSource, SvxTextForwarder,
-        SvxViewForwarder and SvxEditViewForwarder interfaces in order
-        to enable your object to cooperate with this
-        class. SvxTextForwarder encapsulates the fact that text
-        objects do not necessarily have an EditEngine at their
-        disposal, SvxViewForwarder and SvxEditViewForwarder do the
-        same for the document and the edit view. The three mentioned
-        forwarder objects are not stored by the AccessibleTextHelper,
-        but fetched every time from the SvxEditSource. So you are best
-        off making your SvxEditSource::Get*Forwarder methods cache the
-        current forwarder.
-
-        As this class is intended for static (i.e. non-changing) text
-        only, no event broadcasting is necessary. You must handle
-        visibility by yourself, the bounding boxes returned by
-        getCharacterBounds() are relative to your accessibility
-        object.
-
-        @attention All public non-UNO methods (those are the uppercase
-        ones) must not be called with any mutex hold, except when
-        calling from the main thread (with holds the solar mutex),
-        unless stated otherwise. This is because they themselves might
-        need the solar mutex in addition to the object mutex, and the
-        ordering of the locking must be: first solar mutex, then
-        object mutex. Furthermore, state change events might be fired
-        internally.
-
-        @derive Use this class as a base for objects containing static
-        edit engine text. To avoid overwriting every interface method
-        to intercept derived object defunc state, just set NULL as the
-        edit source. Every interface method will then properly throw
-        an exception.
-    */
-    class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
-    {
-
-    public:
-        /** Create accessible text object for given edit source
-
-            @param pEditSource
-            The edit source to use. Object ownership is transferred
-            from the caller to the callee. The object listens on the
-            SvxEditSource for object disposal, so no provisions have
-            to be taken if the caller destroys the data (e.g. the
-            model) contained in the given SvxEditSource.
-
-        */
-        explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource );
-        virtual ~AccessibleStaticTextBase();
-
-    private:
-
-        // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
-        // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
-
-    public:
-        /** Query the current edit source
-
-            @attention This method returns by reference, so you are
-            responsible for serialization (typically, you aquired the
-            solar mutex when calling this method). Thus, the method
-            should only be called from the main office thread.
-
-        */
-        virtual const SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Set the current edit source
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            The EditSource set here is required to broadcast out the
-            following hints: EDITSOURCE_HINT_PARASMOVED,
-            EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED,
-            TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED,
-            TEXT_HINT_TEXTHEIGHTCHANGED,
-            TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes
-            will get noticed by the accessibility object. Further
-            more, when the corresponding core object or the model is
-            dying, either the edit source must be set to NULL or it
-            has to broadcast a SFX_HINT_DYING hint.
-
-            This class does not have a dispose method, since it is not
-            a UNO component. Nevertheless, it holds C++ references to
-            several core objects, so you should issue a
-            SetEditSource(::std::auto_ptr<SvxEditSource>(NULL)) in
-            your dispose() method.
-
-            @param pEditSource
-            The new edit source to set. Object ownership is transferred
-            from the caller to the callee.
-        */
-        virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Set the event source
-
-            @attention When setting a reference here, you should call
-            Dispose() when you as the owner are disposing, since until
-            then this object will hold that reference
-
-            @param rInterface
-            The interface that should be set as the source for
-            accessibility events sent by this object.
-         */
-        virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface );
-
-        /** Get the event source
-
-            @return the interface that is set as the source for
-            accessibility events sent by this object.
-         */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const;
-
-        /** Set offset of EditEngine from parent
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            If the origin of the underlying EditEngine does
-            not correspond to the upper left corner of the object
-            using this class, you have to specify the offset.
-
-            @param rPoint
-            The offset in screen coordinates (i.e. pixel)
-        */
-        virtual void SetOffset( const Point& rPoint );
-
-        /** Query offset of EditEngine from parent
-
-            @return the offset in screen coordinates (i.e. pixel)
-        */
-        virtual Point GetOffset() const;
-
-        /** Update the visible children
-
-            As this class currently does not represent any content
-            using children, this does nothing at the moment.
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            This method reevaluates the visibility of all
-            childrens. Call this method if your visibility state has
-            changed somehow, e.g. if the visible area has changed and
-            the AccessibleStaticTextHelper isn't notified
-            internally. Normally, there should not be a need to call
-            this method.
-        */
-        virtual void UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Drop all references and enter disposed state
-
-            This method drops all references to external objects (also
-            the event source reference set via SetEventSource()) and
-            sets the object into the disposed state (i.e. the methods
-            return default values or throw a uno::DisposedException
-            exception).
-         */
-        virtual void Dispose();
-
-        // XAccessibleText interface implementation
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
-        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // XAccessibleTextAttributes
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // child-related methods from XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // child-related methods from XAccessibleComponent
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-
-    protected:
-        Rectangle GetParagraphBoundingBox() const;
-
-    private:
-
-        /// @dyn
-        const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
-
-    };
-
-} // end of namespace accessibility
-
-#endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */
diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/ActionDescriptionProvider.hxx
index 68f48ca1b2..5b6e0ab9ab 100644
--- a/svx/inc/ActionDescriptionProvider.hxx
+++ b/svx/inc/ActionDescriptionProvider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ActionDescriptionProvider.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/DescriptionGenerator.hxx
index 7aacb234b5..6497443fa2 100644
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/DescriptionGenerator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DescriptionGenerator.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/EnhancedCustomShapeFunctionParser.hxx
index cdfa4dadad..a81ca66996 100755..100644
--- a/svx/inc/EnhancedCustomShapeFunctionParser.hxx
+++ b/svx/inc/EnhancedCustomShapeFunctionParser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeFunctionParser.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/ParseContext.hxx
index 947bfbf706..6b0ec247a3 100644
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/ParseContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParseContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/UnoForbiddenCharsTable.hxx b/svx/inc/UnoForbiddenCharsTable.hxx
index 1fae284ecc..8517204fdf 100644
--- a/svx/inc/UnoForbiddenCharsTable.hxx
+++ b/svx/inc/UnoForbiddenCharsTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoForbiddenCharsTable.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/UnoNamespaceMap.hxx
index b0660be5da..7e3a1be005 100644
--- a/svx/inc/UnoNamespaceMap.hxx
+++ b/svx/inc/UnoNamespaceMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoNamespaceMap.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/XPropertyTable.hxx
index d1dedc0918..59ca1e1e08 100644
--- a/svx/inc/XPropertyTable.hxx
+++ b/svx/inc/XPropertyTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPropertyTable.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
index 8909545e61..e110969878 100644
--- a/svx/inc/accessibility.hrc
+++ b/svx/inc/accessibility.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessibility.hrc,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/acorrcfg.hxx b/svx/inc/acorrcfg.hxx
index 2c34f0ed12..1e0590ce54 100644
--- a/svx/inc/acorrcfg.hxx
+++ b/svx/inc/acorrcfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acorrcfg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/anchorid.hxx b/svx/inc/anchorid.hxx
index d518a7b2da..976d0dc504 100644
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/anchorid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: anchorid.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/asiancfg.hxx b/svx/inc/asiancfg.hxx
index b9cc3abd31..1c788feb14 100644
--- a/svx/inc/asiancfg.hxx
+++ b/svx/inc/asiancfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asiancfg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx
index 9a05a6910e..b2cf9b7b1c 100644
--- a/svx/inc/bolnitem.hxx
+++ b/svx/inc/bolnitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bolnitem.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx
index 4f2b665408..f87cafc994 100644
--- a/svx/inc/bulitem.hxx
+++ b/svx/inc/bulitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bulitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/charhiddenitem.hxx b/svx/inc/charhiddenitem.hxx
index 1cff33a509..895c69d031 100644
--- a/svx/inc/charhiddenitem.hxx
+++ b/svx/inc/charhiddenitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charhiddenitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx
index d1ba824d6d..8cb804837b 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/chrtitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chrtitem.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx
index 773b84773e..34e4a81274 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/clipboardctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: clipboardctl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx
index f77f9dd09d..d16527cc01 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/clipfmtitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: clipfmtitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/connctrl.hxx b/svx/inc/connctrl.hxx
index 0b3de2fb1a..1ebd85ac69 100644
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/connctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connctrl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/connect.hrc b/svx/inc/connect.hrc
index 39c174da28..2d0584d942 100644
--- a/svx/inc/connect.hrc
+++ b/svx/inc/connect.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connect.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/countryid.hxx b/svx/inc/countryid.hxx
index 7ade5f1008..9fc14e0c18 100644
--- a/svx/inc/countryid.hxx
+++ b/svx/inc/countryid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: countryid.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/databaseregistrationui.hxx
index a28c0d6aa4..995f985c6e 100644
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/databaseregistrationui.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: databaseregistrationui.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/dbexch.hrc b/svx/inc/dbexch.hrc
index f0b138b670..51c712f4bb 100644
--- a/svx/inc/dbexch.hrc
+++ b/svx/inc/dbexch.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbexch.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/defdlgname.hxx b/svx/inc/defdlgname.hxx
index c94f5f6167..0d2de71e49 100644
--- a/svx/inc/defdlgname.hxx
+++ b/svx/inc/defdlgname.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defdlgname.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx
index 9faa5e69f9..bf030e26d7 100644
--- a/svx/inc/dgdefs_.hxx
+++ b/svx/inc/dgdefs_.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dgdefs_.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/dialcontrol.hxx
index 233ad1a851..3b63ac1f4b 100644
--- a/svx/inc/dialcontrol.hxx
+++ b/svx/inc/dialcontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialcontrol.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx
index 8fd31234f5..6a0134df4e 100644
--- a/svx/inc/dialdll.hxx
+++ b/svx/inc/dialdll.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialdll.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx
index 8b840a44cf..b18c56b692 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/dlgutil.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgutil.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index c8378deae7..49651ada73 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dragmt3d.hxx,v $
- * $Revision: 1.8.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx
index 6acf482ef5..53e4adc9ba 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/drawitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: drawitem.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx
index df00ceb15f..679c64d527 100644
--- a/svx/inc/drawuiks.hxx
+++ b/svx/inc/drawuiks.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: drawuiks.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/editstat.hxx b/svx/inc/editstat.hxx
index a658509aad..d507f0e2ed 100644
--- a/svx/inc/editstat.hxx
+++ b/svx/inc/editstat.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editstat.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/editund2.hxx b/svx/inc/editund2.hxx
index 2f294295a3..766ca4e16c 100644
--- a/svx/inc/editund2.hxx
+++ b/svx/inc/editund2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editund2.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/edtspell.hxx b/svx/inc/edtspell.hxx
index f2d0717e39..57cf3453ef 100644
--- a/svx/inc/edtspell.hxx
+++ b/svx/inc/edtspell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: edtspell.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/eerdll.hxx b/svx/inc/eerdll.hxx
index 511b7111fa..a05a39c52a 100644
--- a/svx/inc/eerdll.hxx
+++ b/svx/inc/eerdll.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eerdll.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx
index b2d03ec397..6bae981924 100644
--- a/svx/inc/extrusioncontrols.hxx
+++ b/svx/inc/extrusioncontrols.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrusioncontrols.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/flagsdef.hxx
index f0fa65f193..82d6b2da20 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/flagsdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: flagsdef.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index f041f7e4f7..66cd7399ac 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: float3d.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/flstitem.hxx b/svx/inc/flstitem.hxx
index 9bb53a2942..cd3d6eec92 100644
--- a/svx/inc/flstitem.hxx
+++ b/svx/inc/flstitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: flstitem.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/fmgridif.hxx
index d9a7ad66ee..0949ed42d4 100644
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/fmgridif.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmgridif.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 0d00d17f39..1fe6008f5d 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmhelp.hrc,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/fmobjfac.hxx
index 1134fc1e03..7d10ea2ab7 100644
--- a/svx/inc/fmobjfac.hxx
+++ b/svx/inc/fmobjfac.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmobjfac.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fontitem.hxx b/svx/inc/fontitem.hxx
index 82efbf7dbe..5996936693 100644
--- a/svx/inc/fontitem.hxx
+++ b/svx/inc/fontitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontitem.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fontlb.hxx b/svx/inc/fontlb.hxx
index 2b12b98039..5c6373dd86 100644
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/fontlb.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: fontlb.hxx,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/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index 0d9337a1fa..3a29b77ac7 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkgallery.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/fontworkgallery.hxx
index 77de26d548..5becc11d60 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/fontworkgallery.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkgallery.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/forbiddencharacterstable.hxx b/svx/inc/forbiddencharacterstable.hxx
index f6b80e1401..186f6a9e2e 100644
--- a/svx/inc/forbiddencharacterstable.hxx
+++ b/svx/inc/forbiddencharacterstable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: forbiddencharacterstable.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/formatpaintbrushctrl.hxx
index 9e4bbb4bd5..3b819ff2f1 100644
--- a/svx/inc/formatpaintbrushctrl.hxx
+++ b/svx/inc/formatpaintbrushctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formatpaintbrushctrl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx
index 7f5367a47a..b1a41a91c5 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/svx/inc/fwdtitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fwdtitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galbrws.hxx b/svx/inc/galbrws.hxx
index 6e4da56fe1..f8e2ff09bf 100644
--- a/svx/inc/galbrws.hxx
+++ b/svx/inc/galbrws.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galbrws.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index b1e619c218..bb6878abd7 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galbrws2.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx
index 5611332119..bfd25e1b31 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/galctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galctrl.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galdlg.hxx b/svx/inc/galdlg.hxx
index 07570c76d8..17cd99ace8 100644
--- a/svx/inc/galdlg.hxx
+++ b/svx/inc/galdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galdlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 718c84c7aa..c4900a4e3b 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallery.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/gallery.hxx b/svx/inc/gallery.hxx
index c362b8ff92..8bd21c41c8 100644
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/gallery.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallery.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/gallery1.hxx b/svx/inc/gallery1.hxx
index 6c508c2311..bdcde37417 100644
--- a/svx/inc/gallery1.hxx
+++ b/svx/inc/gallery1.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallery1.hxx,v $
- * $Revision: 1.8.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galmisc.hxx b/svx/inc/galmisc.hxx
index d19fac542e..22cb4a630f 100644
--- a/svx/inc/galmisc.hxx
+++ b/svx/inc/galmisc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galmisc.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index d106f4b6ce..9ccbe25da8 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galobj.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 7e1d8e03db..ec1708eef7 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galtheme.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 2ff2d26d60..915505d856 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galtheme.hxx,v $
- * $Revision: 1.11.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/globl3d.hxx b/svx/inc/globl3d.hxx
index b914ab65d1..84e56da862 100644
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/globl3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globl3d.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc
index 51167b054d..ad56077fb4 100644
--- a/svx/inc/globlac.hrc
+++ b/svx/inc/globlac.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: globlac.hrc,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 327bd45d53..cd179395fd 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -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: globlmn_tmpl.hrc,v $
- * $Revision: 1.11.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx
index 78b24e8d15..ae1294481a 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/grafctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grafctrl.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 22d3175fa1..8291f3e797 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helpid.hrc,v $
- * $Revision: 1.78 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/hlmarkwn_def.hxx b/svx/inc/hlmarkwn_def.hxx
index 11e283f1c8..6c38c15a66 100644
--- a/svx/inc/hlmarkwn_def.hxx
+++ b/svx/inc/hlmarkwn_def.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmarkwn_def.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx
index 70541df263..83fc5de017 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/hlnkitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlnkitem.hxx,v $
- * $Revision: 1.6.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx
index 785bddde20..f280defc37 100644
--- a/svx/inc/htmlcfg.hxx
+++ b/svx/inc/htmlcfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: htmlcfg.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/htmlmode.hxx b/svx/inc/htmlmode.hxx
index 56a376b6a9..885092912f 100644
--- a/svx/inc/htmlmode.hxx
+++ b/svx/inc/htmlmode.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: htmlmode.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/hyperdlg.hxx
index 216ad929b6..fc129763e6 100644
--- a/svx/inc/hyperdlg.hxx
+++ b/svx/inc/hyperdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyperdlg.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx
index 8ec9224d06..5762119c1f 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/imapdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapdlg.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/impgrf.hxx b/svx/inc/impgrf.hxx
index b12068e958..fa43ca8724 100644
--- a/svx/inc/impgrf.hxx
+++ b/svx/inc/impgrf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impgrf.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/insctrl.hxx b/svx/inc/insctrl.hxx
index 81bee6e2eb..761e73ba89 100644
--- a/svx/inc/insctrl.hxx
+++ b/svx/inc/insctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insctrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/layctrl.hxx b/svx/inc/layctrl.hxx
index 629f5d7c47..f739727d0d 100644
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/layctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layctrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/lboxctrl.hxx
index ebd82952c6..a719a2a600 100644
--- a/svx/inc/lboxctrl.hxx
+++ b/svx/inc/lboxctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lboxctrl.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx
index 4f66c7df57..181630bdd4 100644
--- a/svx/inc/lightdlg.hxx
+++ b/svx/inc/lightdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lightdlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx
index e3d3a5dfbb..a73ed6f166 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/linectrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linectrl.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/linkmgr.hxx b/svx/inc/linkmgr.hxx
index 4c18bf7a14..b614aba70d 100644
--- a/svx/inc/linkmgr.hxx
+++ b/svx/inc/linkmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkmgr.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/makefile.mk b/svx/inc/makefile.mk
index 357b21f5a8..ffd71c4b4e 100644
--- a/svx/inc/makefile.mk
+++ b/svx/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/inc/measctrl.hxx b/svx/inc/measctrl.hxx
index e665325b3b..88a9a5ea40 100644
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/measctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measctrl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/modctrl.hxx b/svx/inc/modctrl.hxx
index e1f41a8af5..25fdf962cb 100644
--- a/svx/inc/modctrl.hxx
+++ b/svx/inc/modctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: modctrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/mscodec.hxx b/svx/inc/mscodec.hxx
index b80a778f1c..4c958e8964 100644
--- a/svx/inc/mscodec.hxx
+++ b/svx/inc/mscodec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mscodec.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/msoleexp.hxx b/svx/inc/msoleexp.hxx
index 12ac521b87..e6b9da71dc 100644
--- a/svx/inc/msoleexp.hxx
+++ b/svx/inc/msoleexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msoleexp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/multipat.hrc b/svx/inc/multipat.hrc
index 67d0d8277a..0bfda7212f 100644
--- a/svx/inc/multipat.hrc
+++ b/svx/inc/multipat.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multipat.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/nlbkitem.hxx b/svx/inc/nlbkitem.hxx
index 57e48f6492..9fa3aa3652 100644
--- a/svx/inc/nlbkitem.hxx
+++ b/svx/inc/nlbkitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nlbkitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/numvset.hxx b/svx/inc/numvset.hxx
index 04b3fffae2..55a9627d31 100644
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/numvset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numvset.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/objfac3d.hxx
index c4787c5a52..6ce30853f4 100644
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/objfac3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objfac3d.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx
index 8be5742c6d..0f2ae35f61 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/ofaitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ofaitem.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/opaqitem.hxx b/svx/inc/opaqitem.hxx
index 61bae7ff80..0a741bb29d 100644
--- a/svx/inc/opaqitem.hxx
+++ b/svx/inc/opaqitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opaqitem.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/opengrf.hxx b/svx/inc/opengrf.hxx
index ea52c28087..dd946bf191 100644
--- a/svx/inc/opengrf.hxx
+++ b/svx/inc/opengrf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opengrf.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optaccessibility.hrc b/svx/inc/optaccessibility.hrc
index 447283ad30..87c8725b49 100644
--- a/svx/inc/optaccessibility.hrc
+++ b/svx/inc/optaccessibility.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optaccessibility.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optasian.hrc b/svx/inc/optasian.hrc
index 7f52fbc683..061e440b36 100644
--- a/svx/inc/optasian.hrc
+++ b/svx/inc/optasian.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optasian.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optcolor.hrc b/svx/inc/optcolor.hrc
index 53f9494005..25a86b938f 100644
--- a/svx/inc/optcolor.hrc
+++ b/svx/inc/optcolor.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optcolor.hrc,v $
- * $Revision: 1.8.196.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optctl.hrc b/svx/inc/optctl.hrc
index b85b008256..9488dc7208 100644
--- a/svx/inc/optctl.hrc
+++ b/svx/inc/optctl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optctl.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optextbr.hrc b/svx/inc/optextbr.hrc
index f882328115..8e3f797c55 100644
--- a/svx/inc/optextbr.hrc
+++ b/svx/inc/optextbr.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optextbr.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optgenrl.hrc b/svx/inc/optgenrl.hrc
index 898b66b520..a9f36cd3a7 100644
--- a/svx/inc/optgenrl.hrc
+++ b/svx/inc/optgenrl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgenrl.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/optgenrl.hxx
index 368448e32c..8427c81912 100644
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/optgenrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgenrl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index c219a9e542..072177bb9d 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgrid.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optimprove.hrc b/svx/inc/optimprove.hrc
index 919b01c6fb..024e5d5aae 100644
--- a/svx/inc/optimprove.hrc
+++ b/svx/inc/optimprove.hrc
@@ -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: optimprove.hrc,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/svx/inc/optinet2.hrc b/svx/inc/optinet2.hrc
index aa2442eb05..18f3a68662 100644
--- a/svx/inc/optinet2.hrc
+++ b/svx/inc/optinet2.hrc
@@ -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: optinet2.hrc,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/svx/inc/optitems.hxx b/svx/inc/optitems.hxx
index 4d6b6a0040..94d4c784ca 100644
--- a/svx/inc/optitems.hxx
+++ b/svx/inc/optitems.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optitems.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optjsearch.hrc b/svx/inc/optjsearch.hrc
index 7f5765a4b3..38e8cf72aa 100644
--- a/svx/inc/optjsearch.hrc
+++ b/svx/inc/optjsearch.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjsearch.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optpath.hrc b/svx/inc/optpath.hrc
index 8dcb7df10d..45c03ee7fb 100644
--- a/svx/inc/optpath.hrc
+++ b/svx/inc/optpath.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optpath.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optsave.hrc b/svx/inc/optsave.hrc
index 10fe7e584a..4cbdc0e2db 100644
--- a/svx/inc/optsave.hrc
+++ b/svx/inc/optsave.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optsave.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/optspell.hrc b/svx/inc/optspell.hrc
index ad38af0d87..a8e7f9eece 100644
--- a/svx/inc/optspell.hrc
+++ b/svx/inc/optspell.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optspell.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/orienthelper.hxx b/svx/inc/orienthelper.hxx
index 3bbbaac77e..7508740b62 100644
--- a/svx/inc/orienthelper.hxx
+++ b/svx/inc/orienthelper.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: orienthelper.hxx,v $
- * $Revision: 1.5.274.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/passwd.hxx b/svx/inc/passwd.hxx
index e4fcb33bb8..c211c90f1e 100644
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/passwd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx
index 1bc25aad15..71c3408c6f 100644
--- a/svx/inc/pch/precompiled_svx.cxx
+++ b/svx/inc/pch/precompiled_svx.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_svx.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 8e9bc4d179..5e355f6d1f 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.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: precompiled_svx.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx
index 68bc87c49a..2a5d906402 100644
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/pfiledlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pfiledlg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/pgrditem.hxx b/svx/inc/pgrditem.hxx
index f0a15bc7f3..078903eec7 100644
--- a/svx/inc/pgrditem.hxx
+++ b/svx/inc/pgrditem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pgrditem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx
index 7771e5ba73..d7ef799709 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/postattr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postattr.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/prntitem.hxx b/svx/inc/prntitem.hxx
index 8f510cf8ba..0cd8e402a6 100644
--- a/svx/inc/prntitem.hxx
+++ b/svx/inc/prntitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prntitem.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/protitem.hxx b/svx/inc/protitem.hxx
index fc8ddbab23..53e55349e4 100644
--- a/svx/inc/protitem.hxx
+++ b/svx/inc/protitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: protitem.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/prtqry.hxx b/svx/inc/prtqry.hxx
index 69f5d1a61e..ce7ae23921 100644
--- a/svx/inc/prtqry.hxx
+++ b/svx/inc/prtqry.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prtqry.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/pszctrl.hxx b/svx/inc/pszctrl.hxx
index 08cecbb7b1..caa319117d 100644
--- a/svx/inc/pszctrl.hxx
+++ b/svx/inc/pszctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pszctrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/radiobtnbox.hxx b/svx/inc/radiobtnbox.hxx
index 27e041b985..2d3d350901 100644
--- a/svx/inc/radiobtnbox.hxx
+++ b/svx/inc/radiobtnbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: radiobtnbox.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/relfld.hxx b/svx/inc/relfld.hxx
index 08c2b1a3b3..02d9ca20a5 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/relfld.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: relfld.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx
index 6314e3ba00..38381fa848 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/rotmodit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rotmodit.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/rubydialog.hxx
index a36c82189d..d9ff3212a0 100644
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/rubydialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rubydialog.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx
index 7237316d4f..c0b14abdb4 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/rulritem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rulritem.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/sdrpaintwindow.hxx
index 175b1eba25..f9ec23b1bc 100644
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/sdrpaintwindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrpaintwindow.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/selctrl.hxx b/svx/inc/selctrl.hxx
index b87bd3d2fc..6997122041 100644
--- a/svx/inc/selctrl.hxx
+++ b/svx/inc/selctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selctrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index fb934596e2..5a7c67d2ef 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sjctrl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/srchcfg.hxx b/svx/inc/srchcfg.hxx
index 625d88b74c..f89630abd7 100644
--- a/svx/inc/srchcfg.hxx
+++ b/svx/inc/srchcfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchcfg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index 1df6e3da9f..54595c5911 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.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: srchdlg.hxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx
index f15b8a6641..a363106915 100644
--- a/svx/inc/srchitem.hxx
+++ b/svx/inc/srchitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
index 46029ac3a0..588869ff98 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svdglob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdglob.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 534ff73c2a..7cede8672b 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdibrow.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svditer.hxx b/svx/inc/svditer.hxx
index 0dc391ec46..c61599be5a 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svditer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svditer.hxx,v $
- * $Revision: 1.9.246.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx
index f13dfde67b..5ed76f739c 100644
--- a/svx/inc/svdpomv.hxx
+++ b/svx/inc/svdpomv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpomv.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx
index 2c92e3fa6c..2b28525cbb 100644
--- a/svx/inc/svdshort.hxx
+++ b/svx/inc/svdshort.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdshort.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 8bf727b7f1..c748901780 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -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: svdstr.hrc,v $
- * $Revision: 1.18.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svdviter.hxx
index a73f134c7f..8b6ac0c609 100644
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svdviter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdviter.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svimbase.hxx
index 45529cde40..f3dfb243bf 100644
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svimbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svimbase.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleComponentBase.hxx b/svx/inc/svx/AccessibleComponentBase.hxx
index 1b39f3c7f6..8031435ee3 100644
--- a/svx/inc/svx/AccessibleComponentBase.hxx
+++ b/svx/inc/svx/AccessibleComponentBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleComponentBase.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleContextBase.hxx b/svx/inc/svx/AccessibleContextBase.hxx
index 552942f7bc..dcf6d8edc6 100644
--- a/svx/inc/svx/AccessibleContextBase.hxx
+++ b/svx/inc/svx/AccessibleContextBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleContextBase.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx
index 93e6c89e82..1bf5adec40 100644
--- a/svx/inc/svx/AccessibleControlShape.hxx
+++ b/svx/inc/svx/AccessibleControlShape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleControlShape.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx
index 0201663839..b035afc9e0 100644
--- a/svx/inc/svx/AccessibleGraphicShape.hxx
+++ b/svx/inc/svx/AccessibleGraphicShape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleGraphicShape.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx
index a9a2ff3ee2..9b74fc7e06 100644
--- a/svx/inc/svx/AccessibleOLEShape.hxx
+++ b/svx/inc/svx/AccessibleOLEShape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleOLEShape.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index b176c7c942..21998f4ced 100755..100644
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleShape.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx
index d5f1c8c0d6..3aa8908087 100644
--- a/svx/inc/svx/AccessibleShapeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleShapeInfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
index 32106b1d08..f43f0666a4 100644
--- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleShapeTreeInfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx
index 056766df3b..fd2dd171e9 100644
--- a/svx/inc/svx/AccessibleTableShape.hxx
+++ b/svx/inc/svx/AccessibleTableShape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleTableShape.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx
index 971f50cf15..1d0b8cdf8c 100644
--- a/svx/inc/svx/AccessibleTextHelper.hxx
+++ b/svx/inc/svx/AccessibleTextHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleTextHelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx
index 4cf14a5295..b9730d6e29 100644
--- a/svx/inc/svx/ChildrenManager.hxx
+++ b/svx/inc/svx/ChildrenManager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChildrenManager.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx
index 2e80f4c106..64485a5331 100644
--- a/svx/inc/svx/IAccessibleParent.hxx
+++ b/svx/inc/svx/IAccessibleParent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IAccessibleParent.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx
index 5539c73812..74b2f1a351 100644
--- a/svx/inc/svx/IAccessibleViewForwarder.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarder.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IAccessibleViewForwarder.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
index 6a207ea7f8..84634a1430 100644
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IAccessibleViewForwarderListener.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx
index bd6cb3c008..f8e82c5bad 100755..100644
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/svx/inc/svx/ShapeTypeHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ShapeTypeHandler.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx
index b815660800..a58002379e 100644
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/svx/inc/svx/SmartTagCtl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SmartTagCtl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index 51400570db..3e229a0cdc 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SmartTagItem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index 7821b2ce13..3dc7233bbc 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SmartTagMgr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index 58f594da3b..c4b634b447 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellDialogChildWindow.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/SpellPortions.hxx b/svx/inc/svx/SpellPortions.hxx
index c7644ae7a0..a793c0041d 100644
--- a/svx/inc/svx/SpellPortions.hxx
+++ b/svx/inc/svx/SpellPortions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellPortions.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx
index cf5ec424f7..b4c76f1935 100644
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/svx/inc/svx/SvxShapeTypes.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: SvxShapeTypes.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx
index 818c3c8596..326e736588 100644
--- a/svx/inc/svx/adjitem.hxx
+++ b/svx/inc/svx/adjitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: adjitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx
index 54e7785b81..7f96f7688f 100644
--- a/svx/inc/svx/akrnitem.hxx
+++ b/svx/inc/svx/akrnitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: akrnitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index 81473875b4..bc7d7e77c8 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: algitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx
index 37430bc883..d8dfd8e9aa 100644
--- a/svx/inc/svx/blnkitem.hxx
+++ b/svx/inc/svx/blnkitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: blnkitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index f9ecfac490..0eda7143a5 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bmpmask.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx
index 2337c66f79..f358aadb2c 100644
--- a/svx/inc/svx/borderline.hxx
+++ b/svx/inc/svx/borderline.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: borderline.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx
index 82736c7410..45aa879ad0 100644
--- a/svx/inc/svx/boxitem.hxx
+++ b/svx/inc/svx/boxitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: boxitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx
index 30fd5ea1a7..db31afa2c0 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/svx/inc/svx/brkitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: brkitem.hxx,v $
- * $Revision: 1.4.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx
index baf4b12ff5..4642a4e47d 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/svx/inc/svx/brshitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: brshitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 99359feaa6..53ea9b3dde 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: camera3d.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 290c14073f..4a579506cb 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.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: charmap.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx
index b23e3c6c15..4f690ae618 100644
--- a/svx/inc/svx/charreliefitem.hxx
+++ b/svx/inc/svx/charreliefitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charreliefitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx
index d81fbf6567..0d7120e277 100644
--- a/svx/inc/svx/charrotateitem.hxx
+++ b/svx/inc/svx/charrotateitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charrotateitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx
index 9a635dac25..9227bc88e7 100644
--- a/svx/inc/svx/charscaleitem.hxx
+++ b/svx/inc/svx/charscaleitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charscaleitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index c8d04d526a..028d6366b1 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: checklbx.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx
index 76179a11bc..bf6f698a10 100644
--- a/svx/inc/svx/cmapitem.hxx
+++ b/svx/inc/svx/cmapitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cmapitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx
index fc8e5d19bc..ca64c58246 100644
--- a/svx/inc/svx/cntritem.hxx
+++ b/svx/inc/svx/cntritem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cntritem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 08b80f77d5..f1e2cc4654 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: colrctrl.hxx,v $
- * $Revision: 1.3.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx
index b8d300e14a..1308caca2b 100644
--- a/svx/inc/svx/colritem.hxx
+++ b/svx/inc/svx/colritem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: colritem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 66592b96bd..b70a550141 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contdlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx
index 4ee7fdb7dc..44ab60ac68 100644
--- a/svx/inc/svx/crsditem.hxx
+++ b/svx/inc/svx/crsditem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: crsditem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/cscoitem.hxx b/svx/inc/svx/cscoitem.hxx
index 6c6d5c5f4d..168ef77bb2 100644
--- a/svx/inc/svx/cscoitem.hxx
+++ b/svx/inc/svx/cscoitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cscoitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index a893f7d6d4..c5f198c370 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ctredlin.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index b280128fc8..13a156a13d 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cube3d.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx
index c6d835023d..c7c884330f 100644
--- a/svx/inc/svx/dataaccessdescriptor.hxx
+++ b/svx/inc/svx/dataaccessdescriptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dataaccessdescriptor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx
index 1e1ef50350..694a679bb7 100644
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/svx/inc/svx/databaselocationinput.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: databaselocationinput.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx
index 8d097e0971..461314eb30 100644
--- a/svx/inc/svx/dbaexchange.hxx
+++ b/svx/inc/svx/dbaexchange.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbaexchange.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx
index 4585534d1e..c0d558e0b0 100644
--- a/svx/inc/svx/dbaobjectex.hxx
+++ b/svx/inc/svx/dbaobjectex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbaobjectex.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
index 342f54c1e4..89523fe4c3 100755..100644
--- a/svx/inc/svx/dbcharsethelper.hxx
+++ b/svx/inc/svx/dbcharsethelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbcharsethelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index ae5721a87f..8f044bdcc9 100755..100644
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtoolsclient.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx
index 76f28b5782..6d280cdc32 100644
--- a/svx/inc/svx/def3d.hxx
+++ b/svx/inc/svx/def3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: def3d.hxx,v $
- * $Revision: 1.3.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index 244eb81381..9f4d2f820d 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: deflt3d.hxx,v $
- * $Revision: 1.3.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx
index 00308321af..b178089704 100644
--- a/svx/inc/svx/dialmgr.hxx
+++ b/svx/inc/svx/dialmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialmgr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 08652fad52..7a7a77a9ae 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -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: dialogs.hrc,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/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index 8b70601dc8..594ba35145 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgctl3d.hxx,v $
- * $Revision: 1.4.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index c60dcd7df7..cf332d927b 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgctrl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx
index a859e12a7f..23001f888e 100644
--- a/svx/inc/svx/dstribut_enum.hxx
+++ b/svx/inc/svx/dstribut_enum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dstribut_enum.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 5056451c63..4e82e25304 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3ditem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx
index ecc413a47e..0f41ccedce 100644
--- a/svx/inc/svx/e3dsceneupdater.hxx
+++ b/svx/inc/svx/e3dsceneupdater.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dsceneupdater.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index c31a6f60f7..da141b2c24 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dundo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx
index 64949e46d0..48af10a73d 100644
--- a/svx/inc/svx/editdata.hxx
+++ b/svx/inc/svx/editdata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editdata.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/editeng.hxx b/svx/inc/svx/editeng.hxx
index d117950382..6b02ccc89c 100644
--- a/svx/inc/svx/editeng.hxx
+++ b/svx/inc/svx/editeng.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: editeng.hxx,v $
- * $Revision: 1.8.14.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx
index 90a13b7114..cbcc63b269 100644
--- a/svx/inc/svx/editobj.hxx
+++ b/svx/inc/svx/editobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editobj.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/editview.hxx b/svx/inc/svx/editview.hxx
index f0b47412ed..96c8e5b283 100644
--- a/svx/inc/svx/editview.hxx
+++ b/svx/inc/svx/editview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editview.hxx,v $
- * $Revision: 1.4.198.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -244,7 +241,7 @@ public:
 
     static bool ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFontList );
 
-    String			GetSurroundingText() const;

+    String			GetSurroundingText() const;
     Selection		GetSurroundingTextSelection() const;
 };
 
diff --git a/svx/inc/svx/eedata.hxx b/svx/inc/svx/eedata.hxx
index 32634f95fe..99dd41047f 100644
--- a/svx/inc/svx/eedata.hxx
+++ b/svx/inc/svx/eedata.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eedata.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/eeitem.hxx b/svx/inc/svx/eeitem.hxx
index e828c91d08..239dc686ed 100644
--- a/svx/inc/svx/eeitem.hxx
+++ b/svx/inc/svx/eeitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eeitem.hxx,v $
- * $Revision: 1.3.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/eeitemid.hxx b/svx/inc/svx/eeitemid.hxx
index b66675eeb3..565877c9e5 100644
--- a/svx/inc/svx/eeitemid.hxx
+++ b/svx/inc/svx/eeitemid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eeitemid.hxx,v $
- * $Revision: 1.3.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx
index f7aab6ba52..8a661a3b33 100644
--- a/svx/inc/svx/emphitem.hxx
+++ b/svx/inc/svx/emphitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: emphitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/escherex.hxx b/svx/inc/svx/escherex.hxx
index d021a13466..ec05b82389 100644
--- a/svx/inc/svx/escherex.hxx
+++ b/svx/inc/svx/escherex.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: escherex.hxx,v $
- * $Revision: 1.6.146.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx
index ed18f2bfab..7921cf243e 100644
--- a/svx/inc/svx/escpitem.hxx
+++ b/svx/inc/svx/escpitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: escpitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index 4d5d62e145..20c518d603 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrud3d.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx
index c767893a21..4f8d384296 100644
--- a/svx/inc/svx/extrusionbar.hxx
+++ b/svx/inc/svx/extrusionbar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrusionbar.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index c09ee45f90..4b9496c1f0 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: f3dchild.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx
index 3dd2489b30..ea8b213879 100644
--- a/svx/inc/svx/fhgtitem.hxx
+++ b/svx/inc/svx/fhgtitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fhgtitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index e36b6b3502..490412cd2c 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fillctrl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx
index 0957d8554f..3b473c32aa 100644
--- a/svx/inc/svx/flditem.hxx
+++ b/svx/inc/svx/flditem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: flditem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index bf7d49545f..b9e6ba4746 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: float3d.hxx,v $
- * $Revision: 1.3.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx
index 5a9c9db96e..26af5971be 100644
--- a/svx/inc/svx/fmdmod.hxx
+++ b/svx/inc/svx/fmdmod.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdmod.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index eab9b42ce9..714826e0e0 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdpage.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx
index ba28de8e4d..0cc151b734 100644
--- a/svx/inc/svx/fmglob.hxx
+++ b/svx/inc/svx/fmglob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmglob.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index 08dd55eb57..15497ba6fe 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmgridcl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index 2a11234085..7cad530220 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmmodel.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 1c894e1c7f..cc87a7213e 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmpage.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 8eccd5be30..024860a318 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsearch.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index fdcbdd58b6..e3540a2d17 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmshell.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index c580abae5a..074eaf10b0 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmview.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index 03435c4e96..a066996221 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fntctl.hxx,v $
- * $Revision: 1.4.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 31422c88b1..45f6d40d9c 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fntctrl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx
index e4ca0394ff..66bfeaf4af 100644
--- a/svx/inc/svx/fntszctl.hxx
+++ b/svx/inc/svx/fntszctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fntszctl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 8446d73ee3..05aba36f13 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontwork.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx
index e49cd33afd..f6772e6010 100644
--- a/svx/inc/svx/fontworkbar.hxx
+++ b/svx/inc/svx/fontworkbar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkbar.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx
index 9cb082031a..b8fb1ef896 100644
--- a/svx/inc/svx/forbiddenruleitem.hxx
+++ b/svx/inc/svx/forbiddenruleitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: forbiddenruleitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx
index a1ae128183..f720c215ff 100644
--- a/svx/inc/svx/framebordertype.hxx
+++ b/svx/inc/svx/framebordertype.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framebordertype.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index 2bf5138d42..9d5e2cd3b1 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framelink.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx
index d9cabe34f3..cebb4e0395 100644
--- a/svx/inc/svx/framelinkarray.hxx
+++ b/svx/inc/svx/framelinkarray.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framelinkarray.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/frmdir.hxx b/svx/inc/svx/frmdir.hxx
index 81c7a130a0..bc869a3619 100644
--- a/svx/inc/svx/frmdir.hxx
+++ b/svx/inc/svx/frmdir.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdir.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx
index 3e68978b1b..bfdad8bd45 100644
--- a/svx/inc/svx/frmdiritem.hxx
+++ b/svx/inc/svx/frmdiritem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdiritem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx
index 804a90f59b..06c3c9eb56 100644
--- a/svx/inc/svx/frmdirlbox.hxx
+++ b/svx/inc/svx/frmdirlbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdirlbox.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index c6896113a4..b342c58809 100644
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmsel.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index 907e3514da..38090da469 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphctl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index 8a969eb6d3..701c9ae062 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfcrop.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index 1df1daae34..570eeca7ca 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfflt.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 7d398e390e..b0cfa93ec6 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridctrl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/hangulhanja.hxx b/svx/inc/svx/hangulhanja.hxx
index 30466f8c37..1fa1460c2a 100644
--- a/svx/inc/svx/hangulhanja.hxx
+++ b/svx/inc/svx/hangulhanja.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hangulhanja.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index 3fca243482..7bf6c30564 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hdft.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx
index 8561618d57..7f96916bff 100644
--- a/svx/inc/svx/helperhittest3d.hxx
+++ b/svx/inc/svx/helperhittest3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helperhittest3d.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx
index cfb0e3a30e..a282b989a7 100644
--- a/svx/inc/svx/hngpnctitem.hxx
+++ b/svx/inc/svx/hngpnctitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hngpnctitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx
index 133f7bd1e3..1ed132ff82 100644
--- a/svx/inc/svx/hyznitem.hxx
+++ b/svx/inc/svx/hyznitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyznitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx
index 0ed3cebbef..204c836b79 100644
--- a/svx/inc/svx/ifaceids.hxx
+++ b/svx/inc/svx/ifaceids.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ifaceids.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index f0b4b26374..191326d73b 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ipolypolygoneditorcontroller.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx
index a17c608759..484f5a7e9e 100644
--- a/svx/inc/svx/itemtype.hxx
+++ b/svx/inc/svx/itemtype.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemtype.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 0188d98498..f57b9657c5 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemwin.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx
index cd2eb35fb7..762a843163 100644
--- a/svx/inc/svx/keepitem.hxx
+++ b/svx/inc/svx/keepitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: keepitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx
index d909434804..23bf35b269 100644
--- a/svx/inc/svx/kernitem.hxx
+++ b/svx/inc/svx/kernitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kernitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index a99d4eb418..e2d08602f7 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.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: langbox.hxx,v $
- * $Revision: 1.4.242.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx
index 87a26e1df1..1a85ab4679 100644
--- a/svx/inc/svx/langitem.hxx
+++ b/svx/inc/svx/langitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: langitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index c87e6f1983..f0c124f739 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lathe3d.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/lcolitem.hxx b/svx/inc/svx/lcolitem.hxx
index 1530e2a133..d34dd9b9d8 100644
--- a/svx/inc/svx/lcolitem.hxx
+++ b/svx/inc/svx/lcolitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lcolitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx
index 708e59aab9..f21a252440 100644
--- a/svx/inc/svx/lrspitem.hxx
+++ b/svx/inc/svx/lrspitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lrspitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx
index b99411663d..4cef87d495 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/svx/inc/svx/lspcitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lspcitem.hxx,v $
- * $Revision: 1.4.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 4205b23393..c4dbd88477 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msdffdef.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/msdffimp.hxx b/svx/inc/svx/msdffimp.hxx
index 4c7c991546..4b6c085951 100644
--- a/svx/inc/svx/msdffimp.hxx
+++ b/svx/inc/svx/msdffimp.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: msdffimp.hxx,v $
- * $Revision: 1.4.214.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/msfiltertracer.hxx b/svx/inc/svx/msfiltertracer.hxx
index cfb6c895f7..2d5bba907d 100644
--- a/svx/inc/svx/msfiltertracer.hxx
+++ b/svx/inc/svx/msfiltertracer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msfiltertracer.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/msocximex.hxx b/svx/inc/svx/msocximex.hxx
index c9b7b817cd..7e6e08d97c 100644
--- a/svx/inc/svx/msocximex.hxx
+++ b/svx/inc/svx/msocximex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msocximex.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/mutxhelp.hxx b/svx/inc/svx/mutxhelp.hxx
index c3a169f17b..00d7aaa14e 100644
--- a/svx/inc/svx/mutxhelp.hxx
+++ b/svx/inc/svx/mutxhelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mutxhelp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/nhypitem.hxx b/svx/inc/svx/nhypitem.hxx
index 73eeb648e9..6cabf01309 100644
--- a/svx/inc/svx/nhypitem.hxx
+++ b/svx/inc/svx/nhypitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nhypitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/numdef.hxx b/svx/inc/svx/numdef.hxx
index 5807940d18..53051c8a80 100644
--- a/svx/inc/svx/numdef.hxx
+++ b/svx/inc/svx/numdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numdef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 87eeb33d66..2b4871f326 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numfmtsh.hxx,v $
- * $Revision: 1.3.242.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index af53769190..0ca5363fc9 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numinf.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx
index c7138df5f2..76a0c8b546 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/svx/inc/svx/numitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 229d8bcf19..d019ac4ef6 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: obj3d.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/optimprove.hxx b/svx/inc/svx/optimprove.hxx
index 61f184239e..0390fa4ec3 100644
--- a/svx/inc/svx/optimprove.hxx
+++ b/svx/inc/svx/optimprove.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: optimprove.hxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/optlingu.hxx b/svx/inc/svx/optlingu.hxx
index eee2e3d644..ecc4ecd85d 100644
--- a/svx/inc/svx/optlingu.hxx
+++ b/svx/inc/svx/optlingu.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: optlingu.hxx,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/svx/inc/svx/orphitem.hxx b/svx/inc/svx/orphitem.hxx
index 2cf00190af..b81c49053e 100644
--- a/svx/inc/svx/orphitem.hxx
+++ b/svx/inc/svx/orphitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: orphitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx
index 6453898898..5a8f35ffde 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/svx/inc/svx/outliner.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: outliner.hxx,v $
- * $Revision: 1.6.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -388,7 +385,7 @@ public:
     void		SetInvalidateMore( USHORT nPixel );
     USHORT		GetInvalidateMore() const;
 
-    String		GetSurroundingText() const;

+    String		GetSurroundingText() const;
      Selection	GetSurroundingTextSelection() const;
 };
 
diff --git a/svx/inc/svx/outlobj.hxx b/svx/inc/svx/outlobj.hxx
index 470f173d41..7aef7d08df 100644
--- a/svx/inc/svx/outlobj.hxx
+++ b/svx/inc/svx/outlobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outlobj.hxx,v $
- * $Revision: 1.5.78.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx
index 3b53b24e7f..8525c8f7a4 100644
--- a/svx/inc/svx/pagectrl.hxx
+++ b/svx/inc/svx/pagectrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pagectrl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 79f9f6443d..11a1e1fa04 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pageitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/paperinf.hxx b/svx/inc/svx/paperinf.hxx
index f875fb5e62..702239c942 100644
--- a/svx/inc/svx/paperinf.hxx
+++ b/svx/inc/svx/paperinf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paperinf.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/paragraphdata.hxx b/svx/inc/svx/paragraphdata.hxx
index c998cc6291..65b488025b 100644
--- a/svx/inc/svx/paragraphdata.hxx
+++ b/svx/inc/svx/paragraphdata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outlobj.hxx,v $
- * $Revision: 1.5.78.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index de5a1db55d..30f1ed488e 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paraprev.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/paravertalignitem.hxx b/svx/inc/svx/paravertalignitem.hxx
index 394c440a12..84e7ba57f0 100644
--- a/svx/inc/svx/paravertalignitem.hxx
+++ b/svx/inc/svx/paravertalignitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paravertalignitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/pbinitem.hxx b/svx/inc/svx/pbinitem.hxx
index 95ad1193f6..9818dc63cb 100644
--- a/svx/inc/svx/pbinitem.hxx
+++ b/svx/inc/svx/pbinitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pbinitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/pmdlitem.hxx b/svx/inc/svx/pmdlitem.hxx
index c86064a30d..1cfd07ad95 100644
--- a/svx/inc/svx/pmdlitem.hxx
+++ b/svx/inc/svx/pmdlitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pmdlitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 63ceee30cc..e2f29ba4ca 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: polygn3d.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx
index efcfcfd6ff..f7b63e5ff0 100644
--- a/svx/inc/svx/polypolygoneditor.hxx
+++ b/svx/inc/svx/polypolygoneditor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: polypolygoneditor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index c7b32c19c9..d33a12b671 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: polysc3d.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/postitem.hxx b/svx/inc/svx/postitem.hxx
index a259c16848..c01eff5753 100644
--- a/svx/inc/svx/postitem.hxx
+++ b/svx/inc/svx/postitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/prszitem.hxx b/svx/inc/svx/prszitem.hxx
index ff46ab5937..76ed0ae10e 100644
--- a/svx/inc/svx/prszitem.hxx
+++ b/svx/inc/svx/prszitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prszitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx
index 470d01dd8b..98a00c3a11 100644
--- a/svx/inc/svx/rectenum.hxx
+++ b/svx/inc/svx/rectenum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rectenum.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index 58aef4c972..8215c51eda 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ruler.hxx,v $
- * $Revision: 1.4.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index ccccf1ded4..0b1b8411fd 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scene3d.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/scriptspaceitem.hxx b/svx/inc/svx/scriptspaceitem.hxx
index d153c7b27f..e82c15478b 100644
--- a/svx/inc/svx/scriptspaceitem.hxx
+++ b/svx/inc/svx/scriptspaceitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptspaceitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/scripttypeitem.hxx b/svx/inc/svx/scripttypeitem.hxx
index 7850623dec..e34d0fe51e 100644
--- a/svx/inc/svx/scripttypeitem.hxx
+++ b/svx/inc/svx/scripttypeitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scripttypeitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index cecea4f7b1..0cb931bcd3 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdangitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 163172c1da..c0b3f18484 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdasaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index a98dc7a0e2..a35141f8b1 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdasitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx
index 8b55dd8dc4..37c63a2cbc 100644
--- a/svx/inc/svx/sderitm.hxx
+++ b/svx/inc/svx/sderitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sderitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx
index b9ed996f57..4735655951 100644
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/svx/inc/svx/sdgcoitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdgcoitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx
index 680b5d495b..39280361af 100644
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/svx/inc/svx/sdgcpitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdgcpitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index 9327fe343b..866329b574 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdggaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx
index bc494689e5..26198cbc2d 100644
--- a/svx/inc/svx/sdginitm.hxx
+++ b/svx/inc/svx/sdginitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdginitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx
index d8a477a8c8..42d3c5dbc5 100644
--- a/svx/inc/svx/sdgluitm.hxx
+++ b/svx/inc/svx/sdgluitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdgluitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index dbe6a946af..e987ba431f 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdgmoitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx
index 5c091607b4..7416b8d12c 100644
--- a/svx/inc/svx/sdgtritm.hxx
+++ b/svx/inc/svx/sdgtritm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdgtritm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index e4d74645e6..9dd1e9eb2e 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdmetitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 599f12f6ad..e0826d709d 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdooitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index b0bf892e4a..d1ed2e2c3f 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdprcitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx
index fbab0840dc..d92122bfbe 100644
--- a/svx/inc/svx/sdr/animation/animationstate.hxx
+++ b/svx/inc/svx/sdr/animation/animationstate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animationstate.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx
index a618d846ef..adc7f8ffeb 100644
--- a/svx/inc/svx/sdr/animation/objectanimator.hxx
+++ b/svx/inc/svx/sdr/animation/objectanimator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectanimator.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx
index 7c927ec590..e84b6bd1b9 100644
--- a/svx/inc/svx/sdr/animation/scheduler.hxx
+++ b/svx/inc/svx/sdr/animation/scheduler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scheduler.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/attribute/sdrallattribute.hxx b/svx/inc/svx/sdr/attribute/sdrallattribute.hxx
index 092c0e224a..fc2bdc08f8 100644
--- a/svx/inc/svx/sdr/attribute/sdrallattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrallattribute.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrallattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
index aa417b4451..3f911af6e9 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
index c8c80ceb02..6ee4711b4a 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index aaba3620ea..7809ae3d64 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextattribute.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx
index 88776ec5d6..264d88c393 100644
--- a/svx/inc/svx/sdr/contact/displayinfo.hxx
+++ b/svx/inc/svx/sdr/contact/displayinfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: displayinfo.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx
index fe0ce7cbac..632fe58fde 100644
--- a/svx/inc/svx/sdr/contact/objectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontact.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectcontact.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 85b301d20b..f39397ad68 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectcontactofobjlistpainter.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
index ed3ccf4045..d635e170bc 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectcontactofpageview.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx
index dadf99da16..316ad8ff48 100644
--- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontacttools.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: objectcontacttools.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx
index 8a7cca12de..65f8834a5c 100644
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontact.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontact.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
index ad92d5afd5..b8e30b320a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
index 63cb81ddf0..cccb51a4b8 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dcube.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
index 5a5dcf85ae..4fa152af36 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dextrude.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
index 7cb55b8003..5c8502348b 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dlathe.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
index 338ac54634..f681655888 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dpolygon.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
index aec9d8df54..a2c7b9ec3e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofe3dscene.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
index 208ce6cf9f..68a64e888d 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dsphere.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
index 322b55b69a..b207c3e7fb 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofgraphic.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
index df5682c4e8..189f69a731 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofgroup.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index ca66d0aa58..bbf8821788 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofmasterpagedescriptor.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
index 51da09c166..141c33fd35 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofpageobj.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
index 9b2edeec58..5171ce7520 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrcaptionobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
index 11ef52a957..3d0ed6b56a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrcircobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
index e6b79309d2..97ccf16c8c 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdredgeobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 962bb01b06..97f258b2cd 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrmeasureobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 95796b7b3a..9225ad3b1f 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrmediaobj.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
index a25755ad55..c2d90493db 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrobj.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 8db1f88f0b..b58356283e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrobjcustomshape.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index 630187b323..76ff4f8e56 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrole2obj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
index 8b634b6252..5a845d18a1 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrpage.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
index 88da41a7a8..1d2127a3ab 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrpathobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index c1b5f17464..dddedd4e9f 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrrectobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
index ef26648a42..933199761f 100644
--- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactoftextobj.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
index 8a05f91e8f..d0263ce605 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofunocontrol.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
index 1ae5f87956..7aef095351 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofvirtobj.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index c2ea138d7c..35be86421c 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontact.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
index bc00355180..cc6bb136cf 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofe3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
index f1bde37c65..1614add7d5 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofe3dscene.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
index 84c7c35d4c..75940b53f2 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofgraphic.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
index 7cf1f9876c..064b87844e 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofgroup.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 7de4ab2e73..3cb7ba2a7f 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofmasterpagedescriptor.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 444820cc5c..c6bfd593fa 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofpageobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 505bc25791..0ab36a0204 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontactofsdrmediaobj.hxx,v $
- * $Revision: 1.9.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 84445708ec..88245c4639 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofsdrobj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index ae7db471a3..db30200231 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofsdrole2obj.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
index 2ef0c6df41..379112a35d 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofsdrpage.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 3216c857da..039ac16338 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontactofunocontrol.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
index 5a94b39fa3..e22fcb000e 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontactredirector.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx
index e6793ce536..5fda8157b2 100644
--- a/svx/inc/svx/sdr/event/eventhandler.hxx
+++ b/svx/inc/svx/sdr/event/eventhandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventhandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 69438c9ef5..eb1e15aafb 100644
--- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayanimatedbitmapex.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index 531890c6c0..a701cf7c50 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaybitmapex.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
index 5a9f2286f0..13e45fa47b 100644
--- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaycrosshair.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index 497d7c1b89..9917b9adf0 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaybitmap.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
index b51a91621b..04dfaa7bd3 100644
--- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayhelpline.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx
index 314589c47c..2f246e5e9f 100644
--- a/svx/inc/svx/sdr/overlay/overlayline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayline.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayline.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx
index 1ca348a244..2d8a4e92f5 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: overlaymanager.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 709f3be982..f881d21d37 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaymanagerbuffered.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx
index a48afed140..915ef74e04 100644
--- a/svx/inc/svx/sdr/overlay/overlayobject.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobject.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
index 2c9c26888b..5d43983a57 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobjectcell.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 2b87ed1917..118e814404 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobjectlist.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
index 523a9ba652..e30f2f9bfa 100644
--- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaypolypolygon.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 68ece1cb77..82d279bf17 100644
--- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaysdrobject.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
index 9b875ffdba..e4ffa1ffe3 100644
--- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayrollingrectangle.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx
index bd4194cc85..4d2f99467d 100644
--- a/svx/inc/svx/sdr/overlay/overlayselection.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayline.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx
index 761b588f1d..c922593305 100644
--- a/svx/inc/svx/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobject.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
index b9a175fa90..c7520c0ad5 100644
--- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaytriangle.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
index ad4867b4da..d54f362679 100644
--- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: primitiveFactory2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
index 097eecb952..653a3562ef 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrattributecreator.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index c47ba9b1cd..0cc4bb51f1 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrcaptionprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index d4160148c7..098c5edda7 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrconnectorprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 2193dd63af..75860dc8dc 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrcustomshapeprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index d3bf028869..b2f7b86ba9 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrdecompositiontools.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index aa4b76e493..9e67d59ca5 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrellipseprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index b5fb28706d..f30c806c94 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrgrafprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index f228d6c1c7..8c66878589 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrmeasureprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
index ff7e0942dc..bd8c07c9ab 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrole2primitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index e29bfb674d..2c05e460e3 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrcaptionprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
index 199f3c4fdc..bb79eab7c1 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrpathprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index f8d8fb3880..ae20a81986 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: primitiveFactory2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 20dede7f44..deb69a7fd5 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrrectangleprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index b9f27511e0..611d43844d 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextprimitive2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,7 +33,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <svx/outlobj.hxx>
-#include <tools/color.hxx>

+#include <tools/color.hxx>
 #include <svx/sdr/attribute/sdrformtextattribute.hxx>
 #include <tools/weakbase.hxx>
 #include <svx/sdtaitm.hxx>
diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
index 70dc15c62e..462143f8bc 100644
--- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svx_primitivetypes2d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
index 7e776be4c9..809d3f71b1 100644
--- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrattributecreator3d.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx
index 701dcaf728..3043539df0 100644
--- a/svx/inc/svx/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attributeproperties.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx
index 551928b960..124bc19b67 100644
--- a/svx/inc/svx/sdr/properties/captionproperties.hxx
+++ b/svx/inc/svx/sdr/properties/captionproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: captionproperties.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx
index df52c1819f..57efd50b0e 100644
--- a/svx/inc/svx/sdr/properties/circleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/circleproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: circleproperties.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx
index 9fb174d21a..ade61a0e56 100644
--- a/svx/inc/svx/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connectorproperties.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx
index 2cf8037a73..63eb89d794 100644
--- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customshapeproperties.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx
index 149121867d..65b16e07f7 100644
--- a/svx/inc/svx/sdr/properties/defaultproperties.hxx
+++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defaultproperties.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
index 65d2bc4ff8..085da67203 100644
--- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dcompoundproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
index 831e79d738..f6baf589d6 100644
--- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dextrudeproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
index c1d2644e29..37810b36de 100644
--- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dlatheproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx
index fd7f19d7b6..a69d9ecb5f 100644
--- a/svx/inc/svx/sdr/properties/e3dproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
index c5fdbdb581..0ef471999f 100644
--- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dsceneproperties.hxx,v $
- * $Revision: 1.6.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
index f0293911b2..73b68b04e4 100644
--- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dsphereproperties.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx
index f3be3cd408..8e9f28b947 100644
--- a/svx/inc/svx/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: emptyproperties.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx
index 2c9dfb7b2d..b3e04a67da 100644
--- a/svx/inc/svx/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphicproperties.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx
index 24cd73624a..2ee91267cc 100644
--- a/svx/inc/svx/sdr/properties/groupproperties.hxx
+++ b/svx/inc/svx/sdr/properties/groupproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupproperties.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx
index 69d8d5a2ec..24280a086b 100644
--- a/svx/inc/svx/sdr/properties/itemsettools.hxx
+++ b/svx/inc/svx/sdr/properties/itemsettools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemsettools.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx
index 869e79e463..a204ebfe99 100644
--- a/svx/inc/svx/sdr/properties/measureproperties.hxx
+++ b/svx/inc/svx/sdr/properties/measureproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measureproperties.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx
index ec687e8434..11ba3f0198 100644
--- a/svx/inc/svx/sdr/properties/pageproperties.hxx
+++ b/svx/inc/svx/sdr/properties/pageproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pageproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx
index 2b8928e376..e89252a2a3 100644
--- a/svx/inc/svx/sdr/properties/properties.hxx
+++ b/svx/inc/svx/sdr/properties/properties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: properties.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx
index 3fd13a0608..d308a67a87 100644
--- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rectangleproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx
index 08f2603a76..e16bcca15a 100644
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/svx/sdr/properties/textproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textproperties.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx
index 89017fd751..a062ec5210 100644
--- a/svx/inc/svx/sdr/table/tabledesign.hxx
+++ b/svx/inc/svx/sdr/table/tabledesign.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabledesign.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx
index 8a241a759b..4c292db197 100644
--- a/svx/inc/svx/sdrcomment.hxx
+++ b/svx/inc/svx/sdrcomment.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrcomment.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx
index dae0c26487..be0470f8e9 100644
--- a/svx/inc/svx/sdrhittesthelper.hxx
+++ b/svx/inc/svx/sdrhittesthelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdetc.hxx,v $
- * $Revision: 1.4.152.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index f7eb05fb18..5f5fdbe326 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrmasterpagedescriptor.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx
index eda8e9a21f..6d3112d154 100644
--- a/svx/inc/svx/sdrobjectuser.hxx
+++ b/svx/inc/svx/sdrobjectuser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrobjectuser.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx
index 7676267688..d3f35e059f 100644
--- a/svx/inc/svx/sdrpageuser.hxx
+++ b/svx/inc/svx/sdrpageuser.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrpageuser.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index a1874fad6a..aaa74446b7 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrpagewindow.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx
index 350fe199af..7e2cd4052c 100644
--- a/svx/inc/svx/sdshcitm.hxx
+++ b/svx/inc/svx/sdshcitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdshcitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx
index b5b90f73c5..95f98ce943 100644
--- a/svx/inc/svx/sdshitm.hxx
+++ b/svx/inc/svx/sdshitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdshitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx
index ded0191c7a..34a2cf4eb9 100644
--- a/svx/inc/svx/sdshtitm.hxx
+++ b/svx/inc/svx/sdshtitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdshtitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx
index 5f0adc5c1f..3afc487b3a 100644
--- a/svx/inc/svx/sdsxyitm.hxx
+++ b/svx/inc/svx/sdsxyitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdsxyitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index 70de9aeb57..f353c8d724 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtaaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index bf00ce12fb..84c402da47 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtacitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 72e17855b5..d8ba2c7627 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtaditm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx
index 6a3e0527d3..e76ddb8ec7 100644
--- a/svx/inc/svx/sdtagitm.hxx
+++ b/svx/inc/svx/sdtagitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtagitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx
index aa7352b261..a7e5d9506d 100644
--- a/svx/inc/svx/sdtaiitm.hxx
+++ b/svx/inc/svx/sdtaiitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtaiitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index eaac7692a2..8fc0bc658b 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index 165d62c1b6..09b7ab6d52 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtakitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx
index b7517ef973..efe874a005 100644
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/svx/inc/svx/sdtayitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtayitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx
index 37af82cb1f..1763b24bd9 100644
--- a/svx/inc/svx/sdtcfitm.hxx
+++ b/svx/inc/svx/sdtcfitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtcfitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx
index ac9084aff3..5bd53138bd 100644
--- a/svx/inc/svx/sdtditm.hxx
+++ b/svx/inc/svx/sdtditm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtditm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
index 2a630fac6b..05e30f29ce 100644
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/svx/inc/svx/sdtfchim.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtfchim.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index e5ee89aa12..e777bb48ac 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtfsitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx
index c839aada70..9cd82fc587 100644
--- a/svx/inc/svx/sdtmfitm.hxx
+++ b/svx/inc/svx/sdtmfitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdtmfitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 81c3e08c23..f60cb7f02c 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdynitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx
index 4359cc6563..b128a926da 100644
--- a/svx/inc/svx/selectioncontroller.hxx
+++ b/svx/inc/svx/selectioncontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selectioncontroller.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/shaditem.hxx b/svx/inc/svx/shaditem.hxx
index 6160dbeebe..6b4b65bbcd 100644
--- a/svx/inc/svx/shaditem.hxx
+++ b/svx/inc/svx/shaditem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shaditem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx
index 62ef7e7f55..9b08d9c741 100755..100644
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/svx/inc/svx/shapeproperty.hxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 #ifndef SVX_SHAPEPROPERTY_HXX
 #define SVX_SHAPEPROPERTY_HXX
 
diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx
index dd02f4787a..573af71bdc 100644
--- a/svx/inc/svx/shapepropertynotifier.hxx
+++ b/svx/inc/svx/shapepropertynotifier.hxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 #ifndef SVX_PROPERTYCHANGENOTIFIER_HXX
 #define SVX_PROPERTYCHANGENOTIFIER_HXX
 
diff --git a/svx/inc/svx/shdditem.hxx b/svx/inc/svx/shdditem.hxx
index c4fe591783..4d21558263 100644
--- a/svx/inc/svx/shdditem.hxx
+++ b/svx/inc/svx/shdditem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shdditem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index b040131783..cac56c1700 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simptabl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sizeitem.hxx b/svx/inc/svx/sizeitem.hxx
index c5ee7b6e74..0f1af073ca 100644
--- a/svx/inc/svx/sizeitem.hxx
+++ b/svx/inc/svx/sizeitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sizeitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 38f78eca52..e43d3af8eb 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sphere3d.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx
index 5651b2dd80..91212020c2 100644
--- a/svx/inc/svx/splitcelldlg.hxx
+++ b/svx/inc/svx/splitcelldlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitcelldlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/spltitem.hxx b/svx/inc/svx/spltitem.hxx
index 29d0001298..4e4e17145a 100644
--- a/svx/inc/svx/spltitem.hxx
+++ b/svx/inc/svx/spltitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: spltitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/splwrap.hxx b/svx/inc/svx/splwrap.hxx
index 2cc7ccd1a7..79e421a10b 100644
--- a/svx/inc/svx/splwrap.hxx
+++ b/svx/inc/svx/splwrap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splwrap.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx
index 65e3c89744..a667cc7a36 100644
--- a/svx/inc/svx/stddlg.hxx
+++ b/svx/inc/svx/stddlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stddlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx
index 15ba8a7cef..cfda060c35 100644
--- a/svx/inc/svx/strarray.hxx
+++ b/svx/inc/svx/strarray.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strarray.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx
index 52a107adfc..7cb79ff5de 100644
--- a/svx/inc/svx/subtoolboxcontrol.hxx
+++ b/svx/inc/svx/subtoolboxcontrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: subtoolboxcontrol.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx
index 4120f9b103..3696e55dc3 100644
--- a/svx/inc/svx/svdattr.hxx
+++ b/svx/inc/svx/svdattr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdattr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx
index 3f66992555..7fba70ed1e 100644
--- a/svx/inc/svx/svdattrx.hxx
+++ b/svx/inc/svx/svdattrx.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdattrx.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 36f1b3de21..4367997fc9 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdcrtv.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index 3231cd4dd3..7bd68bd42d 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddef.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx
index ef30ed602a..4b24c69baf 100644
--- a/svx/inc/svx/svddrag.hxx
+++ b/svx/inc/svx/svddrag.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrag.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx
index 96fb97c7e6..f2869fa08b 100644
--- a/svx/inc/svx/svddrgmt.hxx
+++ b/svx/inc/svx/svddrgmt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrgmt.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index d86c4bc75f..884e1fbacf 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrgv.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx
index 38b20ef276..eb51661235 100644
--- a/svx/inc/svx/svdedtv.hxx
+++ b/svx/inc/svx/svdedtv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdedtv.hxx,v $
- * $Revision: 1.3.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index c6599092e2..82168f2c7d 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdedxv.hxx,v $
- * $Revision: 1.4.76.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 8a93741bc3..1161249c4e 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdetc.hxx,v $
- * $Revision: 1.4.152.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx
index e6bb3b7ec9..e89a7f8b81 100644
--- a/svx/inc/svx/svdfield.hxx
+++ b/svx/inc/svx/svdfield.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdfield.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdfppt.hxx b/svx/inc/svx/svdfppt.hxx
index 048fb5dba8..bcda890ffe 100644
--- a/svx/inc/svx/svdfppt.hxx
+++ b/svx/inc/svx/svdfppt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdfppt.hxx,v $
- * $Revision: 1.7.6.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx
index 5bef658918..88cd48974f 100644
--- a/svx/inc/svx/svdglev.hxx
+++ b/svx/inc/svx/svdglev.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdglev.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index b4e79f786e..7bca80558b 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdglue.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 473802d7cf..c9869e88e5 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdhdl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index 163026e9d1..4a5ba90618 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdhlpln.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 3ee37edaac..e674fee93d 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdlayer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index 5a42c06f83..f2e17d9b98 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmark.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 56c0e8550e..2001f695fe 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmodel.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index 4639a291a2..d3550f38d4 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmrkv.hxx,v $
- * $Revision: 1.6.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 6ce8f54039..47167e853b 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoashp.hxx,v $
- * $Revision: 1.6.90.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -179,7 +176,7 @@ public:
     virtual UINT16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
-    virtual void SetModel(SdrModel* pNewModel);

+    virtual void SetModel(SdrModel* pNewModel);
 
     virtual void RecalcSnapRect();
 
diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
index ca84262c7b..973c5eb362 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoattr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 93bf3a1479..df0e3fa342 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdobj.hxx,v $
- * $Revision: 1.9.16.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index e2cecd0579..34ab173677 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdocapt.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
index 7fff0c36db..0b6a0c896f 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdocirc.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 0f5366d5b1..e16e94cfbe 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoedge.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 0d74a071a0..c869f894b2 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdograf.hxx,v $
- * $Revision: 1.5.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx
index 5e796b75c9..bc6cfb08bc 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdogrp.hxx,v $
- * $Revision: 1.3.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index e410904fe5..6f98e8c732 100644
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdomeas.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index 14bbfac260..31de61b659 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdomedia.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 41157116b3..b1e580756b 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoole2.hxx,v $
- * $Revision: 1.5.60.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx
index 763f5b9a72..e9c88684a5 100644
--- a/svx/inc/svx/svdopage.hxx
+++ b/svx/inc/svx/svdopage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdopage.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx
index b59ee4b84b..c91fc95517 100644
--- a/svx/inc/svx/svdopath.hxx
+++ b/svx/inc/svx/svdopath.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdopath.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index 9942941d04..c6d876f88a 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdorect.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index f14695ca48..f32e91d644 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotable.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index abe9978730..804e3ccc4a 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotext.hxx,v $
- * $Revision: 1.5.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx
index e6a7d53869..05dd9874b5 100644
--- a/svx/inc/svx/svdouno.hxx
+++ b/svx/inc/svx/svdouno.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdouno.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx
index f5457dd885..8c80b63258 100644
--- a/svx/inc/svx/svdoutl.hxx
+++ b/svx/inc/svx/svdoutl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoutl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index b055c37dc7..88eaae1a8b 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdovirt.hxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 09ff53ee5d..65051bcaa4 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpage.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 3aa7330a6f..fefa337a7e 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpagv.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 33fd3d0812..0c48e1a46a 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpntv.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx
index c3190e0de4..3e833147df 100644
--- a/svx/inc/svx/svdpoev.hxx
+++ b/svx/inc/svx/svdpoev.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpoev.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx
index 75059d7796..9f41cec175 100644
--- a/svx/inc/svx/svdpool.hxx
+++ b/svx/inc/svx/svdpool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpool.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx
index 50853266d9..c5d1befe10 100644
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/svx/inc/svx/svdsnpv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdsnpv.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx
index f7e519f970..8eb4dd1d97 100644
--- a/svx/inc/svx/svdsob.hxx
+++ b/svx/inc/svx/svdsob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdsob.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx
index d44f426958..4bcb2c7741 100644
--- a/svx/inc/svx/svdtext.hxx
+++ b/svx/inc/svx/svdtext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdtext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index e9eb99a153..36116e8213 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdtrans.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx
index 05ba7f8d61..17d0984e56 100644
--- a/svx/inc/svx/svdtypes.hxx
+++ b/svx/inc/svx/svdtypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdtypes.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index de73a88333..77af06869c 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.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: svdundo.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index ecbdc32cb4..03d6932c8d 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdview.hxx,v $
- * $Revision: 1.5.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 9e9d4eab11..9bdd6e005c 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdxcgv.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
index a9ea7d22b1..f5dd386bb6 100644
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/svx/inc/svx/svx3ditems.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svx3ditems.hxx,v $
- * $Revision: 1.4.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx
index 0651f7cd7d..a17dc0827f 100644
--- a/svx/inc/svx/svxacorr.hxx
+++ b/svx/inc/svx/svxacorr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxacorr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx
index 335ecd3373..e58eafbeec 100644
--- a/svx/inc/svx/svxbox.hxx
+++ b/svx/inc/svx/svxbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxbox.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 613d5752f5..c97b3fe71f 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxdlg.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h
index bb52c1e9bf..65670e9344 100644
--- a/svx/inc/svx/svxdllapi.h
+++ b/svx/inc/svx/svxdllapi.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxdllapi.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxenum.hxx b/svx/inc/svx/svxenum.hxx
index d2f2530f27..669b84ce7d 100644
--- a/svx/inc/svx/svxenum.hxx
+++ b/svx/inc/svx/svxenum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxenum.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxfont.hxx b/svx/inc/svx/svxfont.hxx
index a710c64097..36fbefc4b4 100644
--- a/svx/inc/svx/svxfont.hxx
+++ b/svx/inc/svx/svxfont.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxfont.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 4d8f48af85..b02996fd28 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxids.hrc,v $
- * $Revision: 1.10.132.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index 8974d9f29a..134f04c5f9 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxitems.hrc,v $
- * $Revision: 1.3.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/swafopt.hxx b/svx/inc/svx/swafopt.hxx
index 18ae7e0114..7d5077501c 100644
--- a/svx/inc/svx/swafopt.hxx
+++ b/svx/inc/svx/swafopt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swafopt.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx
index 7bb5926078..590e0b114d 100644
--- a/svx/inc/svx/sxallitm.hxx
+++ b/svx/inc/svx/sxallitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxallitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx
index 9118249676..647d6bc0d8 100644
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/svx/inc/svx/sxcaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxcaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index 78ab0344d4..4a96566bfc 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxcecitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx
index 9be0f3c099..e4daddc129 100644
--- a/svx/inc/svx/sxcgitm.hxx
+++ b/svx/inc/svx/sxcgitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxcgitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx
index 6e0ffc1192..f04a672a79 100644
--- a/svx/inc/svx/sxciaitm.hxx
+++ b/svx/inc/svx/sxciaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxciaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index bb051652a4..7bb0678acc 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxcikitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx
index 5b95e25e50..65011beff5 100644
--- a/svx/inc/svx/sxcllitm.hxx
+++ b/svx/inc/svx/sxcllitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxcllitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index 9c11b8b112..bf87440682 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxctitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index 8157d4cc79..d6070096c5 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxekitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx
index 6878592b2d..0f28b16408 100644
--- a/svx/inc/svx/sxelditm.hxx
+++ b/svx/inc/svx/sxelditm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxelditm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx
index 021c32a711..b9ca723fe6 100644
--- a/svx/inc/svx/sxenditm.hxx
+++ b/svx/inc/svx/sxenditm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxenditm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index ab8e35de0e..777186f207 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxfiitm.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx
index 3f86b5e899..3ba8f621aa 100644
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/svx/inc/svx/sxlayitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxlayitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx
index 29dcf6675d..9ef4903329 100644
--- a/svx/inc/svx/sxlogitm.hxx
+++ b/svx/inc/svx/sxlogitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxlogitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx
index b6ac509cbd..1f28844a09 100644
--- a/svx/inc/svx/sxmbritm.hxx
+++ b/svx/inc/svx/sxmbritm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmbritm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx
index 2fbce30fb7..68d0470ff8 100644
--- a/svx/inc/svx/sxmfsitm.hxx
+++ b/svx/inc/svx/sxmfsitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmfsitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index 1ecd7c317b..da7581c0e5 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmkitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx
index c84aa4eb07..1d4ffb5cfb 100644
--- a/svx/inc/svx/sxmlhitm.hxx
+++ b/svx/inc/svx/sxmlhitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmlhitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx
index be5eb5d696..091c66ec49 100644
--- a/svx/inc/svx/sxmoitm.hxx
+++ b/svx/inc/svx/sxmoitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmoitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx
index 5c16334393..360adfc52e 100644
--- a/svx/inc/svx/sxmovitm.hxx
+++ b/svx/inc/svx/sxmovitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmovitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx
index 1e7677b8e2..b58b300915 100644
--- a/svx/inc/svx/sxmsitm.hxx
+++ b/svx/inc/svx/sxmsitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmsitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx
index 9bd74bd81a..3af212ffba 100644
--- a/svx/inc/svx/sxmspitm.hxx
+++ b/svx/inc/svx/sxmspitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmspitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx
index 56b4bca946..bc572a8319 100644
--- a/svx/inc/svx/sxmsuitm.hxx
+++ b/svx/inc/svx/sxmsuitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmsuitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx
index 62b98f8593..e9b35bc425 100644
--- a/svx/inc/svx/sxmtaitm.hxx
+++ b/svx/inc/svx/sxmtaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmtaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx
index a743d2e9be..c971f69f65 100644
--- a/svx/inc/svx/sxmtfitm.hxx
+++ b/svx/inc/svx/sxmtfitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmtfitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index 373396588c..ebd9e2a49f 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmtpitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx
index c7efdaf829..c74c26f665 100644
--- a/svx/inc/svx/sxmtritm.hxx
+++ b/svx/inc/svx/sxmtritm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmtritm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index 6e907000cc..e11ef401ad 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxmuitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx
index b082d72a22..00285b2326 100644
--- a/svx/inc/svx/sxoneitm.hxx
+++ b/svx/inc/svx/sxoneitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxoneitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx
index d19bc696af..ead3ff24f7 100644
--- a/svx/inc/svx/sxonitm.hxx
+++ b/svx/inc/svx/sxonitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxonitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx
index de9f0a247e..947660e71c 100644
--- a/svx/inc/svx/sxopitm.hxx
+++ b/svx/inc/svx/sxopitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxopitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx
index 2b98c6cabd..d0c48d8109 100644
--- a/svx/inc/svx/sxraitm.hxx
+++ b/svx/inc/svx/sxraitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxraitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx
index efb6de9245..ea539f63d1 100644
--- a/svx/inc/svx/sxreaitm.hxx
+++ b/svx/inc/svx/sxreaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxreaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx
index 4d8157bb48..1d090c4b72 100644
--- a/svx/inc/svx/sxreoitm.hxx
+++ b/svx/inc/svx/sxreoitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxreoitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx
index d28fbcefbf..739e3d653f 100644
--- a/svx/inc/svx/sxroaitm.hxx
+++ b/svx/inc/svx/sxroaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxroaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx
index 51fd8e0d05..955ce2bdf6 100644
--- a/svx/inc/svx/sxrooitm.hxx
+++ b/svx/inc/svx/sxrooitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxrooitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx
index b3a4e1939a..095e017d22 100644
--- a/svx/inc/svx/sxsaitm.hxx
+++ b/svx/inc/svx/sxsaitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxsaitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx
index f119686d46..c189934afb 100644
--- a/svx/inc/svx/sxsalitm.hxx
+++ b/svx/inc/svx/sxsalitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxsalitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx
index ed5076065c..e3f11e57bc 100644
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/svx/inc/svx/sxsiitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxsiitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx
index 275bdeb52f..2a0139f937 100644
--- a/svx/inc/svx/sxsoitm.hxx
+++ b/svx/inc/svx/sxsoitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxsoitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx
index 3fcfb19944..bbea7b712c 100644
--- a/svx/inc/svx/sxtraitm.hxx
+++ b/svx/inc/svx/sxtraitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sxtraitm.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index f1d4414654..873dbc576f 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabarea.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index 8ca10e7059..3e17660def 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabline.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 0a8a3a0cec..1a2c9afb9e 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbcontrl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx
index b28eff34f9..23712dacba 100644
--- a/svx/inc/svx/tbxcolorupdate.hxx
+++ b/svx/inc/svx/tbxcolorupdate.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxcolorupdate.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/thesdlg.hxx b/svx/inc/svx/thesdlg.hxx
index 1023cbf161..7912573e3c 100644
--- a/svx/inc/svx/thesdlg.hxx
+++ b/svx/inc/svx/thesdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx
index 1e4dc79301..56b394b693 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/svx/inc/svx/tstpitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tstpitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/twolinesitem.hxx b/svx/inc/svx/twolinesitem.hxx
index aeb65776ab..f242b0017e 100644
--- a/svx/inc/svx/twolinesitem.hxx
+++ b/svx/inc/svx/twolinesitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: twolinesitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc
index 5284dcf24d..59fd7786de 100644
--- a/svx/inc/svx/ucsubset.hrc
+++ b/svx/inc/svx/ucsubset.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucsubset.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx
index 0c4f172792..0d6e35bcaf 100644
--- a/svx/inc/svx/ucsubset.hxx
+++ b/svx/inc/svx/ucsubset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucsubset.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx
index d46f51322f..2c7b4764f9 100644
--- a/svx/inc/svx/udlnitem.hxx
+++ b/svx/inc/svx/udlnitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: udlnitem.hxx,v $
- * $Revision: 1.4.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/ulspitem.hxx b/svx/inc/svx/ulspitem.hxx
index 32f546955b..265bf35cc8 100644
--- a/svx/inc/svx/ulspitem.hxx
+++ b/svx/inc/svx/ulspitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ulspitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx
index b6601ff93a..713768edaa 100644
--- a/svx/inc/svx/unoedsrc.hxx
+++ b/svx/inc/svx/unoedsrc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoedsrc.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unofield.hxx b/svx/inc/svx/unofield.hxx
index 357bdb7711..c04c368ac7 100644
--- a/svx/inc/svx/unofield.hxx
+++ b/svx/inc/svx/unofield.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofield.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unofored.hxx b/svx/inc/svx/unofored.hxx
index 6aa4a18fb0..55bb58911c 100644
--- a/svx/inc/svx/unofored.hxx
+++ b/svx/inc/svx/unofored.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofored.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoforou.hxx b/svx/inc/svx/unoforou.hxx
index bb56d57721..e63e6de14d 100644
--- a/svx/inc/svx/unoforou.hxx
+++ b/svx/inc/svx/unoforou.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoforou.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoipset.hxx b/svx/inc/svx/unoipset.hxx
index d0985f2b66..992a742a44 100644
--- a/svx/inc/svx/unoipset.hxx
+++ b/svx/inc/svx/unoipset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoipset.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx
index 0a0328b924..16e867d99b 100644
--- a/svx/inc/svx/unomid.hxx
+++ b/svx/inc/svx/unomid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomid.hxx,v $
- * $Revision: 1.3.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx
index 31a7589011..8a1f25438a 100644
--- a/svx/inc/svx/unomod.hxx
+++ b/svx/inc/svx/unomod.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomod.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx
index c67daef254..dd60be206c 100644
--- a/svx/inc/svx/unomodel.hxx
+++ b/svx/inc/svx/unomodel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomodel.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index 9d59807ce0..e75f4a0a62 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopage.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoprnms.hxx b/svx/inc/svx/unoprnms.hxx
index 541c2f5577..bcfccb9e87 100644
--- a/svx/inc/svx/unoprnms.hxx
+++ b/svx/inc/svx/unoprnms.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoprnms.hxx,v $
- * $Revision: 1.4.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index fcef2c605b..6bb0aa1f9d 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoprov.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index e516b1bc8f..d13a1df6a9 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.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: unoshape.hxx,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/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 7366f1acf0..1b122acf43 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshprp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx
index 1c0c2d0de6..7840230691 100644
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/svx/inc/svx/unoshtxt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshtxt.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx
index fb06d47343..c18cd447e4 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/svx/inc/svx/unotext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unotext.hxx,v $
- * $Revision: 1.6.84.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoviwed.hxx b/svx/inc/svx/unoviwed.hxx
index 7ac53846da..2ce8688960 100644
--- a/svx/inc/svx/unoviwed.hxx
+++ b/svx/inc/svx/unoviwed.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoviwed.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/unoviwou.hxx b/svx/inc/svx/unoviwou.hxx
index 0f20c15d6d..7b55bcb2ae 100644
--- a/svx/inc/svx/unoviwou.hxx
+++ b/svx/inc/svx/unoviwou.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoviwou.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index 95ceceb1d5..13416d153b 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: view3d.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index 97d1b9349f..afe275cf0d 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewlayoutitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index dbdcac36f3..ac261c48b4 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewpt3d.hxx,v $
- * $Revision: 1.3.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx
index 514d567e73..0d98ef9c95 100644
--- a/svx/inc/svx/volume3d.hxx
+++ b/svx/inc/svx/volume3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: volume3d.hxx,v $
- * $Revision: 1.3.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/wghtitem.hxx b/svx/inc/svx/wghtitem.hxx
index 93575b270e..150378bba0 100644
--- a/svx/inc/svx/wghtitem.hxx
+++ b/svx/inc/svx/wghtitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wghtitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/widwitem.hxx b/svx/inc/svx/widwitem.hxx
index fe553574bd..f46198b409 100644
--- a/svx/inc/svx/widwitem.hxx
+++ b/svx/inc/svx/widwitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: widwitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/writingmodeitem.hxx b/svx/inc/svx/writingmodeitem.hxx
index 0f320b9612..359a7f81dd 100644
--- a/svx/inc/svx/writingmodeitem.hxx
+++ b/svx/inc/svx/writingmodeitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: writingmodeitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/wrlmitem.hxx b/svx/inc/svx/wrlmitem.hxx
index ded8976ca4..727f79cd76 100644
--- a/svx/inc/svx/wrlmitem.hxx
+++ b/svx/inc/svx/wrlmitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrlmitem.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index 96a1893d86..1929be4c3e 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xbitmap.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index 967660d366..c5a4c39cb1 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xbtmpit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index f1bc9f0643..0fbb88d5c8 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xcolit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx
index 2000818362..0033754491 100644
--- a/svx/inc/svx/xdash.hxx
+++ b/svx/inc/svx/xdash.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xdash.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx
index 984bc6c070..08447de069 100644
--- a/svx/inc/svx/xdef.hxx
+++ b/svx/inc/svx/xdef.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xdef.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx
index b9a7eb7d3a..46b500638d 100644
--- a/svx/inc/svx/xenum.hxx
+++ b/svx/inc/svx/xenum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xenum.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx
index 2b50f9d309..99c19c8289 100644
--- a/svx/inc/svx/xfillit.hxx
+++ b/svx/inc/svx/xfillit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfillit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
index 59a9dff68d..563a015de0 100644
--- a/svx/inc/svx/xfillit0.hxx
+++ b/svx/inc/svx/xfillit0.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfillit0.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx
index 2742542bac..a6c54d5619 100644
--- a/svx/inc/svx/xflasit.hxx
+++ b/svx/inc/svx/xflasit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflasit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index ff4e898c29..d9919ff6ea 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbckit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index e4b5174e90..133991483f 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbmpit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index eb22a47016..98dba4ecd7 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbmsli.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index 39eabd4d41..fa035dac78 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbmsxy.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx
index 0aee56400d..c0467be473 100644
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/svx/inc/svx/xflbmtit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbmtit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index 1d1d8d5eb5..50d134c688 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflboxy.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx
index ba2159d7c0..3dcbcd8a6b 100644
--- a/svx/inc/svx/xflbstit.hxx
+++ b/svx/inc/svx/xflbstit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbstit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index 83b283ea77..561bbc4bcd 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflbtoxy.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx
index c579b66c2b..944dc1d718 100644
--- a/svx/inc/svx/xflclit.hxx
+++ b/svx/inc/svx/xflclit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflclit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
index 9737cf3b10..603dd84413 100644
--- a/svx/inc/svx/xflftrit.hxx
+++ b/svx/inc/svx/xflftrit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflftrit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx
index cf1bdcac6c..48d648d463 100644
--- a/svx/inc/svx/xflgrit.hxx
+++ b/svx/inc/svx/xflgrit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflgrit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index 4f6ffefe0e..d291fb5dc9 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xflhtit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx
index 582cc0f6ac..b4b6d8a1b1 100644
--- a/svx/inc/svx/xfltrit.hxx
+++ b/svx/inc/svx/xfltrit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfltrit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
index c50514ff0d..0e11be3316 100644
--- a/svx/inc/svx/xftadit.hxx
+++ b/svx/inc/svx/xftadit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftadit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx
index 56c234a549..66f2a9326c 100644
--- a/svx/inc/svx/xftdiit.hxx
+++ b/svx/inc/svx/xftdiit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftdiit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx
index 040e347de5..9fdeb97de3 100644
--- a/svx/inc/svx/xftmrit.hxx
+++ b/svx/inc/svx/xftmrit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftmrit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx
index 0de655b51c..6a46c1f0ca 100644
--- a/svx/inc/svx/xftouit.hxx
+++ b/svx/inc/svx/xftouit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftouit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
index 28dee62688..d96406382f 100644
--- a/svx/inc/svx/xftsfit.hxx
+++ b/svx/inc/svx/xftsfit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftsfit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx
index f05319fbbe..bccac9df40 100644
--- a/svx/inc/svx/xftshcit.hxx
+++ b/svx/inc/svx/xftshcit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftshcit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
index 87fe4d5457..2fa34df808 100644
--- a/svx/inc/svx/xftshit.hxx
+++ b/svx/inc/svx/xftshit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftshit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx
index fbbdc09769..1617c93ae2 100644
--- a/svx/inc/svx/xftshtit.hxx
+++ b/svx/inc/svx/xftshtit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftshtit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx
index f085f31ff6..8508e3bd51 100644
--- a/svx/inc/svx/xftshxy.hxx
+++ b/svx/inc/svx/xftshxy.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftshxy.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx
index d4630827e4..dd233560e8 100644
--- a/svx/inc/svx/xftstit.hxx
+++ b/svx/inc/svx/xftstit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xftstit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx
index 2ebb23864f..b7bf350d3d 100644
--- a/svx/inc/svx/xgrad.hxx
+++ b/svx/inc/svx/xgrad.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xgrad.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx
index c98573cb02..6a81128048 100644
--- a/svx/inc/svx/xgrscit.hxx
+++ b/svx/inc/svx/xgrscit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xgrscit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx
index 0e4732811f..41098a9ab7 100644
--- a/svx/inc/svx/xhatch.hxx
+++ b/svx/inc/svx/xhatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xhatch.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 35b78558aa..9644c9768e 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx
index acaad7220c..ab7d767fab 100644
--- a/svx/inc/svx/xlineit.hxx
+++ b/svx/inc/svx/xlineit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlineit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
index 9b9f1a8d97..82471996b0 100644
--- a/svx/inc/svx/xlineit0.hxx
+++ b/svx/inc/svx/xlineit0.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlineit0.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx
index ce755f4e1c..13c086c3f6 100644
--- a/svx/inc/svx/xlnasit.hxx
+++ b/svx/inc/svx/xlnasit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnasit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx
index be073fffd2..4e2c494bb4 100644
--- a/svx/inc/svx/xlnclit.hxx
+++ b/svx/inc/svx/xlnclit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnclit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index a39e078b53..c7688179fc 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlndsit.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
index 5b8d309739..a865e4fa34 100644
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/svx/inc/svx/xlnedcit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnedcit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index a0ec1abfb7..a2a828a543 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnedit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
index 50cda7eb59..7cd8857a45 100644
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/svx/inc/svx/xlnedwit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnedwit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
index 5976c7d35f..733bb4df5f 100644
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/svx/inc/svx/xlnstcit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnstcit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index 24475fc0ef..1da23d0d58 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnstit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
index a9b900a230..09a31fe56d 100644
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/svx/inc/svx/xlnstwit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnstwit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx
index e11ea53c74..b2bd1949b8 100644
--- a/svx/inc/svx/xlntrit.hxx
+++ b/svx/inc/svx/xlntrit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlntrit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
index f55bbd6e3e..4bbf067b93 100644
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/svx/inc/svx/xlnwtit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlnwtit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx
index 14fe205f37..409d957cae 100644
--- a/svx/inc/svx/xpoly.hxx
+++ b/svx/inc/svx/xpoly.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xpoly.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx
index 58cf4bea94..8839c5f668 100644
--- a/svx/inc/svx/xpool.hxx
+++ b/svx/inc/svx/xpool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xpool.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx
index 044cff3805..32809eb04b 100644
--- a/svx/inc/svx/xsetit.hxx
+++ b/svx/inc/svx/xsetit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xsetit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx
index be552105b5..1c8b33cc27 100644
--- a/svx/inc/svx/xsflclit.hxx
+++ b/svx/inc/svx/xsflclit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xsflclit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 3253e78878..67f7ada2ea 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtable.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx
index b72d237b28..988feea6b5 100644
--- a/svx/inc/svx/xtextit.hxx
+++ b/svx/inc/svx/xtextit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtextit.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
index 627a93f054..98ef542151 100644
--- a/svx/inc/svx/xtextit0.hxx
+++ b/svx/inc/svx/xtextit0.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtextit0.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index e5c00cba79..2fa6efbc03 100644
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx
index 8c7694cdcb..eef8ec40cc 100644
--- a/svx/inc/svx/zoomsliderctrl.hxx
+++ b/svx/inc/svx/zoomsliderctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomsliderctrl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index 35caf4059b..f6a1557716 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomslideritem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx
index f14477872f..2e8d34d390 100644
--- a/svx/inc/svxempty.hxx
+++ b/svx/inc/svxempty.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxempty.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svxerr.hxx
index 41bd5f6d58..576e444b90 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svxerr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxerr.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svxgrahicitem.hxx
index c725f5784e..02b1a64698 100644
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svxgrahicitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxgrahicitem.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svxmsbas.hxx b/svx/inc/svxmsbas.hxx
index e5f9908e0e..0a77b62d4b 100644
--- a/svx/inc/svxmsbas.hxx
+++ b/svx/inc/svxmsbas.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxmsbas.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx
index 3f0435b309..bfec6a0600 100644
--- a/svx/inc/svxrtf.hxx
+++ b/svx/inc/svxrtf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxrtf.hxx,v $
- * $Revision: 1.24.208.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/swframeexample.hxx b/svx/inc/swframeexample.hxx
index 5cace0710e..9d7c846fca 100644
--- a/svx/inc/swframeexample.hxx
+++ b/svx/inc/swframeexample.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swframeexample.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/swframeposstrings.hxx
index 663563ae66..90e2c4057e 100644
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/swframeposstrings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swframeposstrings.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/swframevalidation.hxx
index 997dd32759..eb72067496 100644
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/swframevalidation.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile$
- * $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx
index ee24ca190b..4c4ea48fc9 100644
--- a/svx/inc/tbunocontroller.hxx
+++ b/svx/inc/tbunocontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbunocontroller.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/tbxalign.hxx b/svx/inc/tbxalign.hxx
index f30fd18810..a3a7e5c664 100644
--- a/svx/inc/tbxalign.hxx
+++ b/svx/inc/tbxalign.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxalign.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/tbxcolor.hxx
index 4fa8c7e577..848c015c29 100644
--- a/svx/inc/tbxcolor.hxx
+++ b/svx/inc/tbxcolor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxcolor.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/tbxctl.hxx
index a0d7b58051..0d159dd256 100644
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/tbxctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxctl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/tbxcustomshapes.hxx
index f3c50cf9ad..f14bc36b58 100644
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/tbxcustomshapes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxcustomshapes.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/tbxdraw.hxx
index 8e0e98bdb7..16c4114844 100644
--- a/svx/inc/tbxdraw.hxx
+++ b/svx/inc/tbxdraw.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxdraw.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/textconv.hxx b/svx/inc/textconv.hxx
index 01af93edfa..05588281ee 100644
--- a/svx/inc/textconv.hxx
+++ b/svx/inc/textconv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textconv.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/txencbox.hxx b/svx/inc/txencbox.hxx
index c861118c87..a6a1f56343 100644
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/txencbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txencbox.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/txenctab.hxx b/svx/inc/txenctab.hxx
index 3da3436108..b402220c18 100644
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/txenctab.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txenctab.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/txtrange.hxx b/svx/inc/txtrange.hxx
index 51c87bc7d1..16fc85547f 100644
--- a/svx/inc/txtrange.hxx
+++ b/svx/inc/txtrange.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtrange.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx
index e5ab210597..fc85cc8e1a 100644
--- a/svx/inc/uiks.hxx
+++ b/svx/inc/uiks.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uiks.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx
index 6d0720e0e0..b8e734fdde 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/unoapi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoapi.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unoedhlp.hxx b/svx/inc/unoedhlp.hxx
index 8e63b8a8b5..468f52c5e6 100644
--- a/svx/inc/unoedhlp.hxx
+++ b/svx/inc/unoedhlp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoedhlp.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unofdesc.hxx b/svx/inc/unofdesc.hxx
index ee35055b1f..38e83c255d 100644
--- a/svx/inc/unofdesc.hxx
+++ b/svx/inc/unofdesc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofdesc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unofill.hxx b/svx/inc/unofill.hxx
index 8715c04d90..8c1a196b00 100644
--- a/svx/inc/unofill.hxx
+++ b/svx/inc/unofill.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofill.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unolingu.hxx b/svx/inc/unolingu.hxx
index 267cd80f44..2773a1aaa3 100644
--- a/svx/inc/unolingu.hxx
+++ b/svx/inc/unolingu.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unolingu.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unomaster.hxx b/svx/inc/unomaster.hxx
index e6ba9d620f..5375367d57 100644
--- a/svx/inc/unomaster.hxx
+++ b/svx/inc/unomaster.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomaster.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index 98ce67b61b..d3ae33e871 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomlstr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unonrule.hxx b/svx/inc/unonrule.hxx
index 4a7d09a0ec..cbe6626d75 100644
--- a/svx/inc/unonrule.hxx
+++ b/svx/inc/unonrule.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unonrule.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unopool.hxx b/svx/inc/unopool.hxx
index 447b294111..1b14be1456 100644
--- a/svx/inc/unopool.hxx
+++ b/svx/inc/unopool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopool.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/unoshcol.hxx b/svx/inc/unoshcol.hxx
index 270f46c313..02fffcbf7b 100644
--- a/svx/inc/unoshcol.hxx
+++ b/svx/inc/unoshcol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshcol.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/verttexttbxctrl.hxx
index ea5f39ad03..8c350e3191 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/verttexttbxctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: verttexttbxctrl.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/wrapfield.hxx b/svx/inc/wrapfield.hxx
index a798fb1a4c..1b4d745c55 100644
--- a/svx/inc/wrapfield.hxx
+++ b/svx/inc/wrapfield.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrapfield.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xattr.hxx b/svx/inc/xattr.hxx
index 6d241d55e8..9a7fa0aef0 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/xattr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xattr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xexch.hxx b/svx/inc/xexch.hxx
index 2e0c291677..ff317f0a75 100644
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/xexch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xexch.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xlinjoit.hxx b/svx/inc/xlinjoit.hxx
index e5ce32d620..d526eb70b8 100644
--- a/svx/inc/xlinjoit.hxx
+++ b/svx/inc/xlinjoit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xlinjoit.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xmlcnitm.hxx b/svx/inc/xmlcnitm.hxx
index 52d14999f5..53f25a77d4 100644
--- a/svx/inc/xmlcnitm.hxx
+++ b/svx/inc/xmlcnitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlcnitm.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/xmleohlp.hxx
index ecda02f71c..ad3b9b0eda 100644
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/xmleohlp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmleohlp.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/xmlexchg.hxx
index 8631b1024d..ff55c283f7 100644
--- a/svx/inc/xmlexchg.hxx
+++ b/svx/inc/xmlexchg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlexchg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx
index 71d52a42c3..e9d05b86d5 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/xmlgrhlp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlgrhlp.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/xmlsecctrl.hxx
index efca38035e..ea816d9525 100644
--- a/svx/inc/xmlsecctrl.hxx
+++ b/svx/inc/xmlsecctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlsecctrl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/xoutbmp.hxx
index 7c09fd0b99..befaf81428 100644
--- a/svx/inc/xoutbmp.hxx
+++ b/svx/inc/xoutbmp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xoutbmp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index a9ea14155e..a0af47a95c 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xpolyimp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/zoomctrl.hxx
index 7a8a067c26..482235b7a6 100644
--- a/svx/inc/zoomctrl.hxx
+++ b/svx/inc/zoomctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomctrl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk
index da8e595ccb..201059155f 100644
--- a/svx/qa/unoapi/makefile.mk
+++ b/svx/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index 4829c2889f..83803b2bda 100644
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmslots.sdi,v $
- * $Revision: 1.15.212.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk
index 2ea64ddedb..4e7a6ad97f 100644
--- a/svx/sdi/makefile.mk
+++ b/svx/sdi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index e3826708c1..3d9f7f1963 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -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: svx.sdi,v $
- * $Revision: 1.78.198.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 377b40130c..ffbf37711d 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxitems.sdi,v $
- * $Revision: 1.32.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc
index a1c7ae70b9..c69dd25efe 100644
--- a/svx/sdi/svxslots.hrc
+++ b/svx/sdi/svxslots.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxslots.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi
index cbf427055d..c897680169 100644
--- a/svx/sdi/svxslots.sdi
+++ b/svx/sdi/svxslots.sdi
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxslots.sdi,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index b612309640..7ed411cd06 100644
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xoitems.sdi,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleComponentBase.cxx b/svx/source/accessibility/AccessibleComponentBase.cxx
index cad94ba608..d837966f6f 100644
--- a/svx/source/accessibility/AccessibleComponentBase.cxx
+++ b/svx/source/accessibility/AccessibleComponentBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleComponentBase.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleContextBase.cxx b/svx/source/accessibility/AccessibleContextBase.cxx
index 1721f8dccd..f7596f42df 100644
--- a/svx/source/accessibility/AccessibleContextBase.cxx
+++ b/svx/source/accessibility/AccessibleContextBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleContextBase.cxx,v $
- * $Revision: 1.28.144.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 5aff34589c..a06be7286f 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleControlShape.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/svx/source/accessibility/AccessibleEditableTextPara.cxx
index 55775b8fbb..b4d26f3a5c 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleEditableTextPara.cxx,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.hxx b/svx/source/accessibility/AccessibleEditableTextPara.hxx
index f78cbd4ad4..ee61970add 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.hxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleEditableTextPara.hxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index e4afee69da..ea7bceeb13 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleEmptyEditSource.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index a3737c181a..1d225c0f99 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleEmptyEditSource.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 49287b16b8..4042dfdcce 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleFrameSelector.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 6b5f1ed8bc..a43c5c649d 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleGraphicShape.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/svx/source/accessibility/AccessibleImageBullet.cxx
index 9212b9dd40..7011d37005 100644
--- a/svx/source/accessibility/AccessibleImageBullet.cxx
+++ b/svx/source/accessibility/AccessibleImageBullet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleImageBullet.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleImageBullet.hxx b/svx/source/accessibility/AccessibleImageBullet.hxx
index faaf811315..9cdbdc49a3 100644
--- a/svx/source/accessibility/AccessibleImageBullet.hxx
+++ b/svx/source/accessibility/AccessibleImageBullet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleImageBullet.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 76142ed8f2..79fe0866e0 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.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: AccessibleOLEShape.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/AccessibleParaManager.cxx b/svx/source/accessibility/AccessibleParaManager.cxx
index 970443c686..93cb4f11d8 100644
--- a/svx/source/accessibility/AccessibleParaManager.cxx
+++ b/svx/source/accessibility/AccessibleParaManager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleParaManager.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleParaManager.hxx b/svx/source/accessibility/AccessibleParaManager.hxx
index 17644c2b7a..f49cfdc511 100644
--- a/svx/source/accessibility/AccessibleParaManager.hxx
+++ b/svx/source/accessibility/AccessibleParaManager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleParaManager.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleSelectionBase.cxx b/svx/source/accessibility/AccessibleSelectionBase.cxx
index 37b769c44f..15f639ce5f 100644
--- a/svx/source/accessibility/AccessibleSelectionBase.cxx
+++ b/svx/source/accessibility/AccessibleSelectionBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleSelectionBase.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 14ec72bfb3..de5d22506c 100755..100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleShape.cxx,v $
- * $Revision: 1.54 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx
index 8b36ad05a3..7d6eb8f4c5 100644
--- a/svx/source/accessibility/AccessibleShapeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeInfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleShapeInfo.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 576275ec38..5241fa5abb 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleShapeTreeInfo.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/svx/source/accessibility/AccessibleStaticTextBase.cxx
index c0227e63cb..ad934f622d 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/svx/source/accessibility/AccessibleStaticTextBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleStaticTextBase.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleStringWrap.cxx b/svx/source/accessibility/AccessibleStringWrap.cxx
index 6a38e254ff..8d98cee56f 100644
--- a/svx/source/accessibility/AccessibleStringWrap.cxx
+++ b/svx/source/accessibility/AccessibleStringWrap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleStringWrap.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 59a67e3c2f..b97a6084e7 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleTextEventQueue.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index 2d1fa86bb9..a626166b4d 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleTextEventQueue.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 6217cf9caf..d91216ec61 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleTextHelper.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index 46eb66ec4e..0b05c43e66 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.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: ChildrenManager.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 1655e3206a..93ce1bdbd7 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.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: ChildrenManagerImpl.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index b28430befa..18d1f43c54 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.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: ChildrenManagerImpl.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index 32251caf13..02bd0305e1 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DGColorNameLookUp.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index d21faf1fc2..391ed93d48 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DescriptionGenerator.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 26c855ba69..79ca704406 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GraphCtlAccessibleContext.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 3145870d38..7a2b7c8d38 100755..100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ShapeTypeHandler.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index e3e28f8678..fc3c59634c 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.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: SvxShapeTypes.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
index 82fe774f5b..6004e1de78 100644
--- a/svx/source/accessibility/accessibility.src
+++ b/svx/source/accessibility/accessibility.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessibility.src,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index fac109fc9c..86d0d331ed 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charmapacc.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
index 8b1802bf1a..e282963aba 100755..100644
--- a/svx/source/accessibility/makefile.mk
+++ b/svx/source/accessibility/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.25 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 75e4ef1d59..96b01b86f8 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.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: svxrectctaccessiblecontext.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/ControlFocusHelper.hxx b/svx/source/cui/ControlFocusHelper.hxx
index addf0f8d1d..a18ee4cf49 100644
--- a/svx/source/cui/ControlFocusHelper.hxx
+++ b/svx/source/cui/ControlFocusHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlFocusHelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/SpellAttrib.cxx b/svx/source/cui/SpellAttrib.cxx
index 8d071f40c5..f8f1ce6472 100644
--- a/svx/source/cui/SpellAttrib.cxx
+++ b/svx/source/cui/SpellAttrib.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellAttrib.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/SpellAttrib.hxx b/svx/source/cui/SpellAttrib.hxx
index e7920d24d1..d83c7c88ac 100644
--- a/svx/source/cui/SpellAttrib.hxx
+++ b/svx/source/cui/SpellAttrib.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellAttrib.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/SpellDialog.cxx b/svx/source/cui/SpellDialog.cxx
index bead9b97bf..1a81908629 100644
--- a/svx/source/cui/SpellDialog.cxx
+++ b/svx/source/cui/SpellDialog.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: SpellDialog.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/SpellDialog.hrc b/svx/source/cui/SpellDialog.hrc
index b4be954bf3..5c9a82ffef 100644
--- a/svx/source/cui/SpellDialog.hrc
+++ b/svx/source/cui/SpellDialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellDialog.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/SpellDialog.src b/svx/source/cui/SpellDialog.src
index 9b899f77b1..403c60c38f 100644
--- a/svx/source/cui/SpellDialog.src
+++ b/svx/source/cui/SpellDialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellDialog.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/acccfg.cxx b/svx/source/cui/acccfg.cxx
index 43e0bb5bae..73a38226f4 100644
--- a/svx/source/cui/acccfg.cxx
+++ b/svx/source/cui/acccfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acccfg.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/acccfg.hrc b/svx/source/cui/acccfg.hrc
index 4fecaf4cb1..ca75cf5fe6 100644
--- a/svx/source/cui/acccfg.hrc
+++ b/svx/source/cui/acccfg.hrc
@@ -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: cfg.hrc,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/svx/source/cui/acccfg.hxx b/svx/source/cui/acccfg.hxx
index d115544cfb..3e8856bb89 100644
--- a/svx/source/cui/acccfg.hxx
+++ b/svx/source/cui/acccfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acccfg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/acccfg.src b/svx/source/cui/acccfg.src
index a8a5ca549b..9e332a9b48 100644
--- a/svx/source/cui/acccfg.src
+++ b/svx/source/cui/acccfg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfg.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/align.cxx b/svx/source/cui/align.cxx
index 77538a9a66..519c6b4b45 100644
--- a/svx/source/cui/align.cxx
+++ b/svx/source/cui/align.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: align.cxx,v $
- * $Revision: 1.26.272.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/align.hrc b/svx/source/cui/align.hrc
index 0eb5bf29f1..97671436ab 100644
--- a/svx/source/cui/align.hrc
+++ b/svx/source/cui/align.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: align.hrc,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/align.hxx b/svx/source/cui/align.hxx
index 4d93e16872..020fe0718e 100644
--- a/svx/source/cui/align.hxx
+++ b/svx/source/cui/align.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: align.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/align.src b/svx/source/cui/align.src
index 9780555d95..f70c9b3d2d 100644
--- a/svx/source/cui/align.src
+++ b/svx/source/cui/align.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: align.src,v $
- * $Revision: 1.55 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/autocdlg.cxx b/svx/source/cui/autocdlg.cxx
index 4da7f0d8d8..86675f5a40 100644
--- a/svx/source/cui/autocdlg.cxx
+++ b/svx/source/cui/autocdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autocdlg.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/autocdlg.hrc b/svx/source/cui/autocdlg.hrc
index 65770dbae1..14bdd5c4a1 100644
--- a/svx/source/cui/autocdlg.hrc
+++ b/svx/source/cui/autocdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autocdlg.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/autocdlg.hxx b/svx/source/cui/autocdlg.hxx
index f6e48d671d..867853aa2f 100644
--- a/svx/source/cui/autocdlg.hxx
+++ b/svx/source/cui/autocdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autocdlg.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/autocdlg.src b/svx/source/cui/autocdlg.src
index 0d9bc123d4..2a54a1bf34 100644
--- a/svx/source/cui/autocdlg.src
+++ b/svx/source/cui/autocdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: autocdlg.src,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/backgrnd.cxx b/svx/source/cui/backgrnd.cxx
index f297f052e8..36b1fb3e9a 100644
--- a/svx/source/cui/backgrnd.cxx
+++ b/svx/source/cui/backgrnd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backgrnd.cxx,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/backgrnd.hrc b/svx/source/cui/backgrnd.hrc
index 056aceb900..47304ffeb0 100644
--- a/svx/source/cui/backgrnd.hrc
+++ b/svx/source/cui/backgrnd.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backgrnd.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/backgrnd.hxx b/svx/source/cui/backgrnd.hxx
index 7c8f3bfe25..ba0dc997b1 100644
--- a/svx/source/cui/backgrnd.hxx
+++ b/svx/source/cui/backgrnd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backgrnd.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/backgrnd.src b/svx/source/cui/backgrnd.src
index e9f847534c..1af7c384c5 100644
--- a/svx/source/cui/backgrnd.src
+++ b/svx/source/cui/backgrnd.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backgrnd.src,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/bbdlg.cxx b/svx/source/cui/bbdlg.cxx
index 0f5ea570f1..6c2459dd2e 100644
--- a/svx/source/cui/bbdlg.cxx
+++ b/svx/source/cui/bbdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bbdlg.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/bbdlg.hxx b/svx/source/cui/bbdlg.hxx
index 2cca611970..c246cc2040 100644
--- a/svx/source/cui/bbdlg.hxx
+++ b/svx/source/cui/bbdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bbdlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/bbdlg.src b/svx/source/cui/bbdlg.src
index 3f9e6ba0f5..6dc65aef9b 100644
--- a/svx/source/cui/bbdlg.src
+++ b/svx/source/cui/bbdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bbdlg.src,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/border.cxx b/svx/source/cui/border.cxx
index 1ab5a45b9e..100a5c6056 100644
--- a/svx/source/cui/border.cxx
+++ b/svx/source/cui/border.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: border.cxx,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/border.hrc b/svx/source/cui/border.hrc
index b0c7e8a4f5..8fa203b67d 100644
--- a/svx/source/cui/border.hrc
+++ b/svx/source/cui/border.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: border.hrc,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/border.hxx b/svx/source/cui/border.hxx
index 3ac644685d..1bc56ee631 100644
--- a/svx/source/cui/border.hxx
+++ b/svx/source/cui/border.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: border.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/border.src b/svx/source/cui/border.src
index dbbb81bc0f..23bd472abc 100644
--- a/svx/source/cui/border.src
+++ b/svx/source/cui/border.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: border.src,v $
- * $Revision: 1.64 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/borderconn.cxx b/svx/source/cui/borderconn.cxx
index 82f51bf2b8..373bbc028f 100644
--- a/svx/source/cui/borderconn.cxx
+++ b/svx/source/cui/borderconn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: borderconn.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/borderconn.hxx b/svx/source/cui/borderconn.hxx
index 740c9c79f2..a3d253af8c 100644
--- a/svx/source/cui/borderconn.hxx
+++ b/svx/source/cui/borderconn.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: borderconn.hxx,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/svx/source/cui/cfg.cxx b/svx/source/cui/cfg.cxx
index 2931be6c17..a24fbb3d16 100644
--- a/svx/source/cui/cfg.cxx
+++ b/svx/source/cui/cfg.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: cfg.cxx,v $
- * $Revision: 1.50.84.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/cfg.hrc b/svx/source/cui/cfg.hrc
index fa8ad15fb8..d2bae12e2d 100644
--- a/svx/source/cui/cfg.hrc
+++ b/svx/source/cui/cfg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfg.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cfg.hxx b/svx/source/cui/cfg.hxx
index 4aee5295e2..f809e4d039 100644
--- a/svx/source/cui/cfg.hxx
+++ b/svx/source/cui/cfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfg.hxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cfg.src b/svx/source/cui/cfg.src
index 978ae6308b..972b835c39 100644
--- a/svx/source/cui/cfg.src
+++ b/svx/source/cui/cfg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfg.src,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cfgchart.cxx b/svx/source/cui/cfgchart.cxx
index 2925fd9e7f..2ecc9cdd18 100644
--- a/svx/source/cui/cfgchart.cxx
+++ b/svx/source/cui/cfgchart.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgchart.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cfgchart.hxx b/svx/source/cui/cfgchart.hxx
index b519823466..150917afbb 100644
--- a/svx/source/cui/cfgchart.hxx
+++ b/svx/source/cui/cfgchart.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfgchart.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cfgutil.cxx b/svx/source/cui/cfgutil.cxx
index 9df95d970d..809ae0d697 100644
--- a/svx/source/cui/cfgutil.cxx
+++ b/svx/source/cui/cfgutil.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: cfg.cxx,v $
- * $Revision: 1.65 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/cfgutil.hxx b/svx/source/cui/cfgutil.hxx
index 0f789ee0b8..b5d24bd822 100644
--- a/svx/source/cui/cfgutil.hxx
+++ b/svx/source/cui/cfgutil.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cfg.hxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/chardlg.cxx b/svx/source/cui/chardlg.cxx
index 7a717188c2..39ae0feaa7 100644
--- a/svx/source/cui/chardlg.cxx
+++ b/svx/source/cui/chardlg.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: chardlg.cxx,v $
- * $Revision: 1.102.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/chardlg.h b/svx/source/cui/chardlg.h
index 960276cba3..e3b97d2d5c 100644
--- a/svx/source/cui/chardlg.h
+++ b/svx/source/cui/chardlg.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chardlg.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/chardlg.hrc b/svx/source/cui/chardlg.hrc
index 303d1b7887..e4d86c3c43 100644
--- a/svx/source/cui/chardlg.hrc
+++ b/svx/source/cui/chardlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chardlg.hrc,v $
- * $Revision: 1.15.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/chardlg.hxx b/svx/source/cui/chardlg.hxx
index e89ac291e7..22f57393a3 100644
--- a/svx/source/cui/chardlg.hxx
+++ b/svx/source/cui/chardlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chardlg.hxx,v $
- * $Revision: 1.8.184.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/chardlg.src b/svx/source/cui/chardlg.src
index 19ad1e0904..9d997dfc67 100644
--- a/svx/source/cui/chardlg.src
+++ b/svx/source/cui/chardlg.src
@@ -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: chardlg.src,v $
- * $Revision: 1.78.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/charmap.hrc b/svx/source/cui/charmap.hrc
index 5f018a9b51..f378368ea6 100644
--- a/svx/source/cui/charmap.hrc
+++ b/svx/source/cui/charmap.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charmap.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/charmap.src b/svx/source/cui/charmap.src
index 5fdecf8a0e..05eb9b399a 100644
--- a/svx/source/cui/charmap.src
+++ b/svx/source/cui/charmap.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charmap.src,v $
- * $Revision: 1.57 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/commonlingui.cxx b/svx/source/cui/commonlingui.cxx
index d8108f93db..2d11b83b0f 100644
--- a/svx/source/cui/commonlingui.cxx
+++ b/svx/source/cui/commonlingui.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commonlingui.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/commonlingui.hxx b/svx/source/cui/commonlingui.hxx
index a6b8142789..ea6ee4acde 100644
--- a/svx/source/cui/commonlingui.hxx
+++ b/svx/source/cui/commonlingui.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commonlingui.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/commonlingui.src b/svx/source/cui/commonlingui.src
index f3d3c05c1a..bf77a2fa60 100644
--- a/svx/source/cui/commonlingui.src
+++ b/svx/source/cui/commonlingui.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: commonlingui.src,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connect.cxx b/svx/source/cui/connect.cxx
index 486bb02403..c9b04b9855 100644
--- a/svx/source/cui/connect.cxx
+++ b/svx/source/cui/connect.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connect.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connect.hxx b/svx/source/cui/connect.hxx
index 9da2afa42d..ac2817d3c7 100644
--- a/svx/source/cui/connect.hxx
+++ b/svx/source/cui/connect.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connect.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connect.src b/svx/source/cui/connect.src
index 21031303e7..6bfff49b32 100644
--- a/svx/source/cui/connect.src
+++ b/svx/source/cui/connect.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connect.src,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpoolconfig.cxx b/svx/source/cui/connpoolconfig.cxx
index 8965dc9105..abd43fa5ce 100644
--- a/svx/source/cui/connpoolconfig.cxx
+++ b/svx/source/cui/connpoolconfig.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpoolconfig.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpoolconfig.hxx b/svx/source/cui/connpoolconfig.hxx
index ebcdb70659..cc39b0407c 100644
--- a/svx/source/cui/connpoolconfig.hxx
+++ b/svx/source/cui/connpoolconfig.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpoolconfig.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpooloptions.cxx b/svx/source/cui/connpooloptions.cxx
index de9b1ec86c..85330c69fb 100644
--- a/svx/source/cui/connpooloptions.cxx
+++ b/svx/source/cui/connpooloptions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpooloptions.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpooloptions.hrc b/svx/source/cui/connpooloptions.hrc
index eae7028968..15befd7b96 100644
--- a/svx/source/cui/connpooloptions.hrc
+++ b/svx/source/cui/connpooloptions.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpooloptions.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpooloptions.hxx b/svx/source/cui/connpooloptions.hxx
index 9bba07f614..0a7c8b3d0b 100644
--- a/svx/source/cui/connpooloptions.hxx
+++ b/svx/source/cui/connpooloptions.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: connpooloptions.hxx,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/svx/source/cui/connpooloptions.src b/svx/source/cui/connpooloptions.src
index 7ca11257e6..1fb2d89aa1 100644
--- a/svx/source/cui/connpooloptions.src
+++ b/svx/source/cui/connpooloptions.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpooloptions.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpoolsettings.cxx b/svx/source/cui/connpoolsettings.cxx
index af588f0b73..c5ead3878c 100644
--- a/svx/source/cui/connpoolsettings.cxx
+++ b/svx/source/cui/connpoolsettings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpoolsettings.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/connpoolsettings.hxx b/svx/source/cui/connpoolsettings.hxx
index 7788ea7e80..f00b8915d3 100644
--- a/svx/source/cui/connpoolsettings.hxx
+++ b/svx/source/cui/connpoolsettings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connpoolsettings.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuicharmap.cxx b/svx/source/cui/cuicharmap.cxx
index d06d962c86..e202760dca 100644
--- a/svx/source/cui/cuicharmap.cxx
+++ b/svx/source/cui/cuicharmap.cxx
@@ -2,7 +2,7 @@
  *
  * 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
  *
diff --git a/svx/source/cui/cuicharmap.hxx b/svx/source/cui/cuicharmap.hxx
index 7ab3974fb1..6ee1f6a77c 100644
--- a/svx/source/cui/cuicharmap.hxx
+++ b/svx/source/cui/cuicharmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuicharmap.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuiexp.cxx b/svx/source/cui/cuiexp.cxx
index cb85d0704d..4508afa518 100644
--- a/svx/source/cui/cuiexp.cxx
+++ b/svx/source/cui/cuiexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuiexp.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuifmsearch.cxx b/svx/source/cui/cuifmsearch.cxx
index 4549d9c7b3..093364c437 100644
--- a/svx/source/cui/cuifmsearch.cxx
+++ b/svx/source/cui/cuifmsearch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuifmsearch.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuifmsearch.hxx b/svx/source/cui/cuifmsearch.hxx
index 23b1ceeccf..f5eae980d6 100644
--- a/svx/source/cui/cuifmsearch.hxx
+++ b/svx/source/cui/cuifmsearch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuifmsearch.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuigaldlg.cxx b/svx/source/cui/cuigaldlg.cxx
index 3c3bb1364e..b3c57fcaba 100644
--- a/svx/source/cui/cuigaldlg.cxx
+++ b/svx/source/cui/cuigaldlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuigaldlg.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuigaldlg.hxx b/svx/source/cui/cuigaldlg.hxx
index 5290fd1cc2..ba15657fd7 100644
--- a/svx/source/cui/cuigaldlg.hxx
+++ b/svx/source/cui/cuigaldlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuigaldlg.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuigrfflt.cxx b/svx/source/cui/cuigrfflt.cxx
index 39c4e44e31..ba212d455d 100644
--- a/svx/source/cui/cuigrfflt.cxx
+++ b/svx/source/cui/cuigrfflt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuigrfflt.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuigrfflt.hxx b/svx/source/cui/cuigrfflt.hxx
index adf9519993..226bb09208 100644
--- a/svx/source/cui/cuigrfflt.hxx
+++ b/svx/source/cui/cuigrfflt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuigrfflt.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuihyperdlg.cxx b/svx/source/cui/cuihyperdlg.cxx
index 3eb69780d8..e684c1f8cc 100644
--- a/svx/source/cui/cuihyperdlg.cxx
+++ b/svx/source/cui/cuihyperdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuihyperdlg.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuihyperdlg.hxx b/svx/source/cui/cuihyperdlg.hxx
index fcd733aca5..bffc478729 100644
--- a/svx/source/cui/cuihyperdlg.hxx
+++ b/svx/source/cui/cuihyperdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuihyperdlg.hxx,v $
- * $Revision: 1.4.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuiimapdlg.hrc b/svx/source/cui/cuiimapdlg.hrc
index 7912b88523..eedf832596 100755..100644
--- a/svx/source/cui/cuiimapdlg.hrc
+++ b/svx/source/cui/cuiimapdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapdlg.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuiimapdlg.src b/svx/source/cui/cuiimapdlg.src
index c686fce380..e1dc6b46cc 100755..100644
--- a/svx/source/cui/cuiimapdlg.src
+++ b/svx/source/cui/cuiimapdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapdlg.src,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuiimapwnd.cxx b/svx/source/cui/cuiimapwnd.cxx
index 72147f49e6..867f6b68ef 100644
--- a/svx/source/cui/cuiimapwnd.cxx
+++ b/svx/source/cui/cuiimapwnd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuiimapwnd.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuioptgenrl.hxx b/svx/source/cui/cuioptgenrl.hxx
index 818c23478d..3f2b544a9f 100644
--- a/svx/source/cui/cuioptgenrl.hxx
+++ b/svx/source/cui/cuioptgenrl.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: cuioptgenrl.hxx,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/svx/source/cui/cuisrchdlg.cxx b/svx/source/cui/cuisrchdlg.cxx
index 6cbe6268d0..bfcd320286 100644
--- a/svx/source/cui/cuisrchdlg.cxx
+++ b/svx/source/cui/cuisrchdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuisrchdlg.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuisrchdlg.hxx b/svx/source/cui/cuisrchdlg.hxx
index 7ed9b2a508..2af5d23df1 100644
--- a/svx/source/cui/cuisrchdlg.hxx
+++ b/svx/source/cui/cuisrchdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuisrchdlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuitabarea.hxx b/svx/source/cui/cuitabarea.hxx
index d21e105957..77d84fb5b8 100644
--- a/svx/source/cui/cuitabarea.hxx
+++ b/svx/source/cui/cuitabarea.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuitabarea.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuitabline.hxx b/svx/source/cui/cuitabline.hxx
index 79ef6f5efe..f650b6e543 100644
--- a/svx/source/cui/cuitabline.hxx
+++ b/svx/source/cui/cuitabline.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuitabline.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/cuitbxform.cxx b/svx/source/cui/cuitbxform.cxx
index 9cbbaca680..0212ef22b9 100644
--- a/svx/source/cui/cuitbxform.cxx
+++ b/svx/source/cui/cuitbxform.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cuitbxform.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregister.cxx b/svx/source/cui/dbregister.cxx
index 0a38f57481..e97760f773 100644
--- a/svx/source/cui/dbregister.cxx
+++ b/svx/source/cui/dbregister.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregister.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregister.hrc b/svx/source/cui/dbregister.hrc
index 9e52057467..54ac95fae5 100644
--- a/svx/source/cui/dbregister.hrc
+++ b/svx/source/cui/dbregister.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregister.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregister.hxx b/svx/source/cui/dbregister.hxx
index 303687300e..a056db1e25 100644
--- a/svx/source/cui/dbregister.hxx
+++ b/svx/source/cui/dbregister.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregister.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregister.src b/svx/source/cui/dbregister.src
index a1be562c03..52709c67f5 100644
--- a/svx/source/cui/dbregister.src
+++ b/svx/source/cui/dbregister.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregister.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/svx/source/cui/dbregisterednamesconfig.cxx
index 3fdfa74f9d..462dda0b6e 100644
--- a/svx/source/cui/dbregisterednamesconfig.cxx
+++ b/svx/source/cui/dbregisterednamesconfig.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregisterednamesconfig.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregisterednamesconfig.hxx b/svx/source/cui/dbregisterednamesconfig.hxx
index 3dc1f36637..b7124d9f07 100644
--- a/svx/source/cui/dbregisterednamesconfig.hxx
+++ b/svx/source/cui/dbregisterednamesconfig.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregisterednamesconfig.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregistersettings.cxx b/svx/source/cui/dbregistersettings.cxx
index 77aad8c7d2..22dbf9c413 100644
--- a/svx/source/cui/dbregistersettings.cxx
+++ b/svx/source/cui/dbregistersettings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregistersettings.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dbregistersettings.hxx b/svx/source/cui/dbregistersettings.hxx
index c6639a66bb..555ecbac5b 100644
--- a/svx/source/cui/dbregistersettings.hxx
+++ b/svx/source/cui/dbregistersettings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbregistersettings.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dlgfact.cxx b/svx/source/cui/dlgfact.cxx
index 28f879e77b..d04c1f40b4 100644
--- a/svx/source/cui/dlgfact.cxx
+++ b/svx/source/cui/dlgfact.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgfact.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dlgfact.hxx b/svx/source/cui/dlgfact.hxx
index a6bd99c97d..d32900ecb7 100644
--- a/svx/source/cui/dlgfact.hxx
+++ b/svx/source/cui/dlgfact.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgfact.hxx,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dlgname.cxx b/svx/source/cui/dlgname.cxx
index 7358247101..d20bacc17f 100644
--- a/svx/source/cui/dlgname.cxx
+++ b/svx/source/cui/dlgname.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgname.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dlgname.hrc b/svx/source/cui/dlgname.hrc
index 80ec21290f..e6b2c6f9f9 100644
--- a/svx/source/cui/dlgname.hrc
+++ b/svx/source/cui/dlgname.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgname.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dlgname.hxx b/svx/source/cui/dlgname.hxx
index cd13055a40..586224c477 100644
--- a/svx/source/cui/dlgname.hxx
+++ b/svx/source/cui/dlgname.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgname.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dlgname.src b/svx/source/cui/dlgname.src
index 2b99ce7e33..1b87e362a4 100644
--- a/svx/source/cui/dlgname.src
+++ b/svx/source/cui/dlgname.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgname.src,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/doclinkdialog.cxx b/svx/source/cui/doclinkdialog.cxx
index d4dc239aaa..fe56832922 100644
--- a/svx/source/cui/doclinkdialog.cxx
+++ b/svx/source/cui/doclinkdialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doclinkdialog.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/doclinkdialog.hrc b/svx/source/cui/doclinkdialog.hrc
index b83b0dbf67..f645906781 100644
--- a/svx/source/cui/doclinkdialog.hrc
+++ b/svx/source/cui/doclinkdialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doclinkdialog.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/doclinkdialog.hxx b/svx/source/cui/doclinkdialog.hxx
index 04e341c614..ca6079c142 100644
--- a/svx/source/cui/doclinkdialog.hxx
+++ b/svx/source/cui/doclinkdialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doclinkdialog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/doclinkdialog.src b/svx/source/cui/doclinkdialog.src
index 29a72695d7..69ec4f5eb1 100644
--- a/svx/source/cui/doclinkdialog.src
+++ b/svx/source/cui/doclinkdialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: doclinkdialog.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dstribut.cxx b/svx/source/cui/dstribut.cxx
index 4d47be04c3..cd15738957 100644
--- a/svx/source/cui/dstribut.cxx
+++ b/svx/source/cui/dstribut.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dstribut.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dstribut.hrc b/svx/source/cui/dstribut.hrc
index c6d891dc19..1fa2114745 100644
--- a/svx/source/cui/dstribut.hrc
+++ b/svx/source/cui/dstribut.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dstribut.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dstribut.hxx b/svx/source/cui/dstribut.hxx
index d4642555dd..245891ddcc 100644
--- a/svx/source/cui/dstribut.hxx
+++ b/svx/source/cui/dstribut.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dstribut.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/dstribut.src b/svx/source/cui/dstribut.src
index a3239c0d76..5ba9e7caf5 100644
--- a/svx/source/cui/dstribut.src
+++ b/svx/source/cui/dstribut.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dstribut.src,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/eventdlg.cxx b/svx/source/cui/eventdlg.cxx
index b1ddbe6398..5f2dfdbcf0 100644
--- a/svx/source/cui/eventdlg.cxx
+++ b/svx/source/cui/eventdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventdlg.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/eventdlg.hrc b/svx/source/cui/eventdlg.hrc
index 1e5484cb22..96beb23459 100644
--- a/svx/source/cui/eventdlg.hrc
+++ b/svx/source/cui/eventdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventdlg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/eventdlg.src b/svx/source/cui/eventdlg.src
index b3fa250c51..7718775f3c 100644
--- a/svx/source/cui/eventdlg.src
+++ b/svx/source/cui/eventdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventdlg.src,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/fontsubs.cxx b/svx/source/cui/fontsubs.cxx
index 9c35b1a833..b08ff2a4e5 100644
--- a/svx/source/cui/fontsubs.cxx
+++ b/svx/source/cui/fontsubs.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontsubs.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/fontsubs.hrc b/svx/source/cui/fontsubs.hrc
index d60ec121d1..71ad6c318a 100644
--- a/svx/source/cui/fontsubs.hrc
+++ b/svx/source/cui/fontsubs.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontsubs.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/fontsubs.hxx b/svx/source/cui/fontsubs.hxx
index c4ea5416a0..fe5c453a82 100644
--- a/svx/source/cui/fontsubs.hxx
+++ b/svx/source/cui/fontsubs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontsubs.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/fontsubs.src b/svx/source/cui/fontsubs.src
index 8d0a0ab7b0..3c9b54b836 100644
--- a/svx/source/cui/fontsubs.src
+++ b/svx/source/cui/fontsubs.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontsubs.src,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/grfflt.hrc b/svx/source/cui/grfflt.hrc
index a119db4330..a13e7109e7 100644
--- a/svx/source/cui/grfflt.hrc
+++ b/svx/source/cui/grfflt.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfflt.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/grfflt.src b/svx/source/cui/grfflt.src
index 24ade4cc67..d88a13fc31 100644
--- a/svx/source/cui/grfflt.src
+++ b/svx/source/cui/grfflt.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfflt.src,v $
- * $Revision: 1.45 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/grfpage.cxx b/svx/source/cui/grfpage.cxx
index aabc03766f..30f37f10b7 100644
--- a/svx/source/cui/grfpage.cxx
+++ b/svx/source/cui/grfpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfpage.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/grfpage.hrc b/svx/source/cui/grfpage.hrc
index b5e2022ff5..eb33d87834 100644
--- a/svx/source/cui/grfpage.hrc
+++ b/svx/source/cui/grfpage.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfpage.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/grfpage.hxx b/svx/source/cui/grfpage.hxx
index 2f66c75bdd..b454bb88fe 100644
--- a/svx/source/cui/grfpage.hxx
+++ b/svx/source/cui/grfpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfpage.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/grfpage.src b/svx/source/cui/grfpage.src
index c8ebbf1348..467277102d 100644
--- a/svx/source/cui/grfpage.src
+++ b/svx/source/cui/grfpage.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfpage.src,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hangulhanjadlg.cxx b/svx/source/cui/hangulhanjadlg.cxx
index 1ee49881f0..ca92155c33 100644
--- a/svx/source/cui/hangulhanjadlg.cxx
+++ b/svx/source/cui/hangulhanjadlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hangulhanjadlg.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hangulhanjadlg.hrc b/svx/source/cui/hangulhanjadlg.hrc
index 22e0e11aa7..3222ebfc05 100644
--- a/svx/source/cui/hangulhanjadlg.hrc
+++ b/svx/source/cui/hangulhanjadlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hangulhanjadlg.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hangulhanjadlg.hxx b/svx/source/cui/hangulhanjadlg.hxx
index 9830de4cab..7d8f34f7fa 100644
--- a/svx/source/cui/hangulhanjadlg.hxx
+++ b/svx/source/cui/hangulhanjadlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hangulhanjadlg.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hangulhanjadlg.src b/svx/source/cui/hangulhanjadlg.src
index 0d0041b67e..b0d79203c2 100644
--- a/svx/source/cui/hangulhanjadlg.src
+++ b/svx/source/cui/hangulhanjadlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hangulhanjadlg.src,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/headertablistbox.hxx b/svx/source/cui/headertablistbox.hxx
index 7c5500fd95..ed0e80ef12 100755..100644
--- a/svx/source/cui/headertablistbox.hxx
+++ b/svx/source/cui/headertablistbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: headertablistbox.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hldocntp.cxx b/svx/source/cui/hldocntp.cxx
index 3bd3bb6c8b..7c052b5985 100644
--- a/svx/source/cui/hldocntp.cxx
+++ b/svx/source/cui/hldocntp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hldocntp.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hldocntp.hxx b/svx/source/cui/hldocntp.hxx
index e005e58192..78964aadf8 100644
--- a/svx/source/cui/hldocntp.hxx
+++ b/svx/source/cui/hldocntp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hldocntp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hldoctp.cxx b/svx/source/cui/hldoctp.cxx
index 2abec10a01..d2b4960de2 100644
--- a/svx/source/cui/hldoctp.cxx
+++ b/svx/source/cui/hldoctp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hldoctp.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hldoctp.hxx b/svx/source/cui/hldoctp.hxx
index 9f2ee7171c..9b6e7dca30 100644
--- a/svx/source/cui/hldoctp.hxx
+++ b/svx/source/cui/hldoctp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hldoctp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hlinettp.cxx b/svx/source/cui/hlinettp.cxx
index 177affd720..daed34b150 100644
--- a/svx/source/cui/hlinettp.cxx
+++ b/svx/source/cui/hlinettp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlinettp.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hlinettp.hxx b/svx/source/cui/hlinettp.hxx
index 565429ceda..9c26b237d4 100644
--- a/svx/source/cui/hlinettp.hxx
+++ b/svx/source/cui/hlinettp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlinettp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hlmailtp.cxx b/svx/source/cui/hlmailtp.cxx
index 283d9d243a..9380286c1a 100644
--- a/svx/source/cui/hlmailtp.cxx
+++ b/svx/source/cui/hlmailtp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmailtp.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hlmailtp.hxx b/svx/source/cui/hlmailtp.hxx
index 39b2bc2670..abf30bdbd7 100644
--- a/svx/source/cui/hlmailtp.hxx
+++ b/svx/source/cui/hlmailtp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmailtp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hlmarkwn.cxx b/svx/source/cui/hlmarkwn.cxx
index e65fbb228d..59efd51e50 100644
--- a/svx/source/cui/hlmarkwn.cxx
+++ b/svx/source/cui/hlmarkwn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmarkwn.cxx,v $
- * $Revision: 1.19.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hlmarkwn.src b/svx/source/cui/hlmarkwn.src
index e14ece64ae..99822658c3 100644
--- a/svx/source/cui/hlmarkwn.src
+++ b/svx/source/cui/hlmarkwn.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmarkwn.src,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hltpbase.cxx b/svx/source/cui/hltpbase.cxx
index 2e76c5be4a..8bea416baa 100644
--- a/svx/source/cui/hltpbase.cxx
+++ b/svx/source/cui/hltpbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hltpbase.cxx,v $
- * $Revision: 1.37.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/hltpbase.hxx b/svx/source/cui/hltpbase.hxx
index 6a8ed9a030..f3e85103b3 100644
--- a/svx/source/cui/hltpbase.hxx
+++ b/svx/source/cui/hltpbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hltpbase.hxx,v $
- * $Revision: 1.8.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/iconcdlg.cxx b/svx/source/cui/iconcdlg.cxx
index 7bd9843fb2..a8211d20d7 100644
--- a/svx/source/cui/iconcdlg.cxx
+++ b/svx/source/cui/iconcdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iconcdlg.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/iconcdlg.hxx b/svx/source/cui/iconcdlg.hxx
index 4dce9737d2..9de298c335 100644
--- a/svx/source/cui/iconcdlg.hxx
+++ b/svx/source/cui/iconcdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iconcdlg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/iconcdlg.src b/svx/source/cui/iconcdlg.src
index fdfa000aa2..a2a9bed4f6 100644
--- a/svx/source/cui/iconcdlg.src
+++ b/svx/source/cui/iconcdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iconcdlg.src,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/init.cxx b/svx/source/cui/init.cxx
index 8b282f3c40..372a2590bf 100644
--- a/svx/source/cui/init.cxx
+++ b/svx/source/cui/init.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: init.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/insdlg.cxx b/svx/source/cui/insdlg.cxx
index 3d72463198..731a5d56ac 100644
--- a/svx/source/cui/insdlg.cxx
+++ b/svx/source/cui/insdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insdlg.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/insdlg.hxx b/svx/source/cui/insdlg.hxx
index 8e4d170492..4bae52ffff 100644
--- a/svx/source/cui/insdlg.hxx
+++ b/svx/source/cui/insdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insdlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/insrc.cxx b/svx/source/cui/insrc.cxx
index e0a7bdc5f0..ef458556f6 100644
--- a/svx/source/cui/insrc.cxx
+++ b/svx/source/cui/insrc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insrc.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/insrc.hrc b/svx/source/cui/insrc.hrc
index 133bcf70c3..194bac86b6 100644
--- a/svx/source/cui/insrc.hrc
+++ b/svx/source/cui/insrc.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insrc.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/insrc.hxx b/svx/source/cui/insrc.hxx
index ea6dd8569d..58bd3c9743 100644
--- a/svx/source/cui/insrc.hxx
+++ b/svx/source/cui/insrc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insrc.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/insrc.src b/svx/source/cui/insrc.src
index 58b6ec63a6..5591030ae1 100644
--- a/svx/source/cui/insrc.src
+++ b/svx/source/cui/insrc.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insrc.src,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/internationaloptions.cxx b/svx/source/cui/internationaloptions.cxx
index 266c0a715c..c43f578f5c 100644
--- a/svx/source/cui/internationaloptions.cxx
+++ b/svx/source/cui/internationaloptions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: internationaloptions.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/internationaloptions.hrc b/svx/source/cui/internationaloptions.hrc
index 84c8450274..106f000468 100644
--- a/svx/source/cui/internationaloptions.hrc
+++ b/svx/source/cui/internationaloptions.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: internationaloptions.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/internationaloptions.hxx b/svx/source/cui/internationaloptions.hxx
index 439dc2a272..b1f8764e8b 100644
--- a/svx/source/cui/internationaloptions.hxx
+++ b/svx/source/cui/internationaloptions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: internationaloptions.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/internationaloptions.src b/svx/source/cui/internationaloptions.src
index f98109c84e..73c941e70b 100644
--- a/svx/source/cui/internationaloptions.src
+++ b/svx/source/cui/internationaloptions.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: internationaloptions.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/labdlg.cxx b/svx/source/cui/labdlg.cxx
index bbcbe9c408..091c5bf11a 100644
--- a/svx/source/cui/labdlg.cxx
+++ b/svx/source/cui/labdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: labdlg.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/labdlg.hrc b/svx/source/cui/labdlg.hrc
index 4916dbbfd0..4a1d7b83ee 100644
--- a/svx/source/cui/labdlg.hrc
+++ b/svx/source/cui/labdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: labdlg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/labdlg.hxx b/svx/source/cui/labdlg.hxx
index c1ec3e261c..b78e95421a 100644
--- a/svx/source/cui/labdlg.hxx
+++ b/svx/source/cui/labdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: labdlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/labdlg.src b/svx/source/cui/labdlg.src
index baacc7af89..c2b7766029 100644
--- a/svx/source/cui/labdlg.src
+++ b/svx/source/cui/labdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: labdlg.src,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/linkdlg.cxx b/svx/source/cui/linkdlg.cxx
index cb4fe626f8..456bc712c9 100644
--- a/svx/source/cui/linkdlg.cxx
+++ b/svx/source/cui/linkdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkdlg.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/linkdlg.hxx b/svx/source/cui/linkdlg.hxx
index 2b746d16b0..011cb79075 100644
--- a/svx/source/cui/linkdlg.hxx
+++ b/svx/source/cui/linkdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkdlg.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macroass.cxx b/svx/source/cui/macroass.cxx
index ed8f8a46f3..f40ed95142 100644
--- a/svx/source/cui/macroass.cxx
+++ b/svx/source/cui/macroass.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macroass.hrc b/svx/source/cui/macroass.hrc
index b92135bd9e..214a99182c 100644
--- a/svx/source/cui/macroass.hrc
+++ b/svx/source/cui/macroass.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macroass.hxx b/svx/source/cui/macroass.hxx
index 55476b1120..1735f17fd8 100755..100644
--- a/svx/source/cui/macroass.hxx
+++ b/svx/source/cui/macroass.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macroass.src b/svx/source/cui/macroass.src
index 84004470fb..b38acba38f 100644
--- a/svx/source/cui/macroass.src
+++ b/svx/source/cui/macroass.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.src,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macropg.cxx b/svx/source/cui/macropg.cxx
index f705df676b..4489269598 100644
--- a/svx/source/cui/macropg.cxx
+++ b/svx/source/cui/macropg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.cxx,v $
- * $Revision: 1.22.166.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macropg.hrc b/svx/source/cui/macropg.hrc
index 661d6b71e0..d7df48534c 100644
--- a/svx/source/cui/macropg.hrc
+++ b/svx/source/cui/macropg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macropg.hxx b/svx/source/cui/macropg.hxx
index 31f1de9cbe..92f64ee047 100644
--- a/svx/source/cui/macropg.hxx
+++ b/svx/source/cui/macropg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg.hxx,v $
- * $Revision: 1.11.166.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/macropg.src b/svx/source/cui/macropg.src
index 20201ec2b1..611c264faa 100644
--- a/svx/source/cui/macropg.src
+++ b/svx/source/cui/macropg.src
@@ -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: macropg.src,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/makefile.mk b/svx/source/cui/makefile.mk
index 7a1db4a85f..238f9abc18 100755..100644
--- a/svx/source/cui/makefile.mk
+++ b/svx/source/cui/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.65 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/measure.cxx b/svx/source/cui/measure.cxx
index 4093e8c2c7..d811344f47 100644
--- a/svx/source/cui/measure.cxx
+++ b/svx/source/cui/measure.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measure.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/measure.hrc b/svx/source/cui/measure.hrc
index 2989139da9..f54ca8858d 100644
--- a/svx/source/cui/measure.hrc
+++ b/svx/source/cui/measure.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measure.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/measure.hxx b/svx/source/cui/measure.hxx
index 8b1394ea8b..8d37845f03 100644
--- a/svx/source/cui/measure.hxx
+++ b/svx/source/cui/measure.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measure.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/measure.src b/svx/source/cui/measure.src
index 83c66b2904..bf89f1d0db 100644
--- a/svx/source/cui/measure.src
+++ b/svx/source/cui/measure.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measure.src,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/multifil.cxx b/svx/source/cui/multifil.cxx
index 4ea8d0d7f9..525c43f9e7 100644
--- a/svx/source/cui/multifil.cxx
+++ b/svx/source/cui/multifil.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multifil.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/multifil.hxx b/svx/source/cui/multifil.hxx
index 33c844ddc7..1914ef935e 100644
--- a/svx/source/cui/multifil.hxx
+++ b/svx/source/cui/multifil.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multifil.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/multipat.cxx b/svx/source/cui/multipat.cxx
index ce074bcb87..a22b0c5622 100644
--- a/svx/source/cui/multipat.cxx
+++ b/svx/source/cui/multipat.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multipat.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/multipat.hxx b/svx/source/cui/multipat.hxx
index 2b0d446eda..bcc8800f64 100644
--- a/svx/source/cui/multipat.hxx
+++ b/svx/source/cui/multipat.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multipat.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/newtabledlg.cxx b/svx/source/cui/newtabledlg.cxx
index 6e8b7a59f7..b5f4274d04 100644
--- a/svx/source/cui/newtabledlg.cxx
+++ b/svx/source/cui/newtabledlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newtabledlg.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/newtabledlg.hrc b/svx/source/cui/newtabledlg.hrc
index 8eba4acee2..2357a4b1a2 100644
--- a/svx/source/cui/newtabledlg.hrc
+++ b/svx/source/cui/newtabledlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newtabledlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/newtabledlg.hxx b/svx/source/cui/newtabledlg.hxx
index a9426c0c07..a8f994483a 100644
--- a/svx/source/cui/newtabledlg.hxx
+++ b/svx/source/cui/newtabledlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newtabledlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/newtabledlg.src b/svx/source/cui/newtabledlg.src
index 8b2bb5bacc..ca29eb6e45 100644
--- a/svx/source/cui/newtabledlg.src
+++ b/svx/source/cui/newtabledlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newtabledlg.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/numfmt.cxx b/svx/source/cui/numfmt.cxx
index 614cd5259f..ef213e875b 100644
--- a/svx/source/cui/numfmt.cxx
+++ b/svx/source/cui/numfmt.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: numfmt.cxx,v $
- * $Revision: 1.32.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/numfmt.hrc b/svx/source/cui/numfmt.hrc
index 15757e76ac..240ba98e04 100644
--- a/svx/source/cui/numfmt.hrc
+++ b/svx/source/cui/numfmt.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numfmt.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/numfmt.hxx b/svx/source/cui/numfmt.hxx
index b5e2df0af4..5f2a632c2c 100644
--- a/svx/source/cui/numfmt.hxx
+++ b/svx/source/cui/numfmt.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: numfmt.hxx,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/svx/source/cui/numfmt.src b/svx/source/cui/numfmt.src
index 6380215e0d..1d04706dfb 100644
--- a/svx/source/cui/numfmt.src
+++ b/svx/source/cui/numfmt.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numfmt.src,v $
- * $Revision: 1.51 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx
index 40673c3fcf..220f1a7d24 100644
--- a/svx/source/cui/numpages.cxx
+++ b/svx/source/cui/numpages.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numpages.cxx,v $
- * $Revision: 1.64 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/numpages.hrc b/svx/source/cui/numpages.hrc
index 76cc93c919..d7dcb82fce 100644
--- a/svx/source/cui/numpages.hrc
+++ b/svx/source/cui/numpages.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numpages.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/numpages.hxx b/svx/source/cui/numpages.hxx
index d0c00b121f..8da5333512 100644
--- a/svx/source/cui/numpages.hxx
+++ b/svx/source/cui/numpages.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numpages.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/numpages.src b/svx/source/cui/numpages.src
index 9c6206045d..01d1355f5d 100644
--- a/svx/source/cui/numpages.src
+++ b/svx/source/cui/numpages.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numpages.src,v $
- * $Revision: 1.64.242.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optHeaderTabListbox.cxx b/svx/source/cui/optHeaderTabListbox.cxx
index e7cc607a61..f8becd1545 100644
--- a/svx/source/cui/optHeaderTabListbox.cxx
+++ b/svx/source/cui/optHeaderTabListbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optHeaderTabListbox.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optHeaderTabListbox.hxx b/svx/source/cui/optHeaderTabListbox.hxx
index 98288257ca..06176ec1db 100644
--- a/svx/source/cui/optHeaderTabListbox.hxx
+++ b/svx/source/cui/optHeaderTabListbox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optHeaderTabListbox.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optaccessibility.cxx b/svx/source/cui/optaccessibility.cxx
index 960cd5e46c..210e6c7184 100644
--- a/svx/source/cui/optaccessibility.cxx
+++ b/svx/source/cui/optaccessibility.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optaccessibility.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optaccessibility.hxx b/svx/source/cui/optaccessibility.hxx
index 037bbaacd9..953f8478dc 100644
--- a/svx/source/cui/optaccessibility.hxx
+++ b/svx/source/cui/optaccessibility.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optaccessibility.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optasian.cxx b/svx/source/cui/optasian.cxx
index 82ada7f5a4..cb5450a3d7 100644
--- a/svx/source/cui/optasian.cxx
+++ b/svx/source/cui/optasian.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optasian.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optasian.hxx b/svx/source/cui/optasian.hxx
index d3fc760ea0..ee72a47bbe 100644
--- a/svx/source/cui/optasian.hxx
+++ b/svx/source/cui/optasian.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optasian.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optchart.cxx b/svx/source/cui/optchart.cxx
index 9e6322155a..aa753c89b0 100644
--- a/svx/source/cui/optchart.cxx
+++ b/svx/source/cui/optchart.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optchart.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optchart.hxx b/svx/source/cui/optchart.hxx
index 16496cdb02..e7ae8675e0 100644
--- a/svx/source/cui/optchart.hxx
+++ b/svx/source/cui/optchart.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optchart.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optcolor.cxx b/svx/source/cui/optcolor.cxx
index 887be321ab..a4e8bf398a 100644
--- a/svx/source/cui/optcolor.cxx
+++ b/svx/source/cui/optcolor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optcolor.cxx,v $
- * $Revision: 1.18.256.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optcolor.hxx b/svx/source/cui/optcolor.hxx
index f30a163533..983b667d6e 100644
--- a/svx/source/cui/optcolor.hxx
+++ b/svx/source/cui/optcolor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optcolor.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optctl.cxx b/svx/source/cui/optctl.cxx
index 26d775cab7..112e49ed43 100644
--- a/svx/source/cui/optctl.cxx
+++ b/svx/source/cui/optctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optctl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optctl.hxx b/svx/source/cui/optctl.hxx
index 4e18b7b8f1..fa4699b1a1 100644
--- a/svx/source/cui/optctl.hxx
+++ b/svx/source/cui/optctl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optctl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optdict.cxx b/svx/source/cui/optdict.cxx
index 166d17fb18..68cdaa1097 100644
--- a/svx/source/cui/optdict.cxx
+++ b/svx/source/cui/optdict.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optdict.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optdict.hxx b/svx/source/cui/optdict.hxx
index 3846a7cf24..99b4f06442 100644
--- a/svx/source/cui/optdict.hxx
+++ b/svx/source/cui/optdict.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optdict.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optfltr.cxx b/svx/source/cui/optfltr.cxx
index f8d185f107..5d4ba2164b 100644
--- a/svx/source/cui/optfltr.cxx
+++ b/svx/source/cui/optfltr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optfltr.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optfltr.hrc b/svx/source/cui/optfltr.hrc
index e53179ebca..9164d80817 100644
--- a/svx/source/cui/optfltr.hrc
+++ b/svx/source/cui/optfltr.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optfltr.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optfltr.hxx b/svx/source/cui/optfltr.hxx
index e8acba8e74..1ac244e56d 100644
--- a/svx/source/cui/optfltr.hxx
+++ b/svx/source/cui/optfltr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optfltr.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optfltr.src b/svx/source/cui/optfltr.src
index 9dd3dd2cdf..5216d21944 100644
--- a/svx/source/cui/optfltr.src
+++ b/svx/source/cui/optfltr.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optfltr.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optgdlg.cxx b/svx/source/cui/optgdlg.cxx
index 12910c0302..eb3f9abf98 100644
--- a/svx/source/cui/optgdlg.cxx
+++ b/svx/source/cui/optgdlg.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: optgdlg.cxx,v $
- * $Revision: 1.53.20.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/optgdlg.hrc b/svx/source/cui/optgdlg.hrc
index 4001d2056a..fd43fcb483 100644
--- a/svx/source/cui/optgdlg.hrc
+++ b/svx/source/cui/optgdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgdlg.hrc,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optgdlg.hxx b/svx/source/cui/optgdlg.hxx
index 52fe207310..047b569073 100644
--- a/svx/source/cui/optgdlg.hxx
+++ b/svx/source/cui/optgdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgdlg.hxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optgdlg.src b/svx/source/cui/optgdlg.src
index f663a7ed44..077a34995e 100644
--- a/svx/source/cui/optgdlg.src
+++ b/svx/source/cui/optgdlg.src
@@ -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: optgdlg.src,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/optgenrl.cxx b/svx/source/cui/optgenrl.cxx
index dd30e74da2..8730958d62 100644
--- a/svx/source/cui/optgenrl.cxx
+++ b/svx/source/cui/optgenrl.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: optgenrl.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/svx/source/cui/opthtml.cxx b/svx/source/cui/opthtml.cxx
index b7ba5a3f3c..8c3bb207a8 100644
--- a/svx/source/cui/opthtml.cxx
+++ b/svx/source/cui/opthtml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opthtml.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/opthtml.hrc b/svx/source/cui/opthtml.hrc
index d017a099fa..8e4d4f4de6 100644
--- a/svx/source/cui/opthtml.hrc
+++ b/svx/source/cui/opthtml.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opthtml.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/opthtml.hxx b/svx/source/cui/opthtml.hxx
index a6e131cef8..cfce308d90 100644
--- a/svx/source/cui/opthtml.hxx
+++ b/svx/source/cui/opthtml.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opthtml.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/opthtml.src b/svx/source/cui/opthtml.src
index f5b872fd51..8ea4161f63 100644
--- a/svx/source/cui/opthtml.src
+++ b/svx/source/cui/opthtml.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opthtml.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optimprove.cxx b/svx/source/cui/optimprove.cxx
index e644cc58d7..e7bf126f68 100644
--- a/svx/source/cui/optimprove.cxx
+++ b/svx/source/cui/optimprove.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: optimprove.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/optimprove2.cxx b/svx/source/cui/optimprove2.cxx
index b988c7b75b..7613f07875 100644
--- a/svx/source/cui/optimprove2.cxx
+++ b/svx/source/cui/optimprove2.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: optimprove2.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/optinet2.cxx b/svx/source/cui/optinet2.cxx
index 2a74cc6761..03f7d66395 100644
--- a/svx/source/cui/optinet2.cxx
+++ b/svx/source/cui/optinet2.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: optinet2.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/optinet2.hxx b/svx/source/cui/optinet2.hxx
index 53f9cc695c..bbf65b53de 100644
--- a/svx/source/cui/optinet2.hxx
+++ b/svx/source/cui/optinet2.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: optinet2.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/optjava.cxx b/svx/source/cui/optjava.cxx
index d9b2acc3f0..f4ebc2aa0d 100644
--- a/svx/source/cui/optjava.cxx
+++ b/svx/source/cui/optjava.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjava.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optjava.hrc b/svx/source/cui/optjava.hrc
index c51016c695..229841ff6f 100644
--- a/svx/source/cui/optjava.hrc
+++ b/svx/source/cui/optjava.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjava.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optjava.hxx b/svx/source/cui/optjava.hxx
index ea8a8c6251..bb68096539 100644
--- a/svx/source/cui/optjava.hxx
+++ b/svx/source/cui/optjava.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjava.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optjava.src b/svx/source/cui/optjava.src
index a5c69644dc..7bbb4217a0 100644
--- a/svx/source/cui/optjava.src
+++ b/svx/source/cui/optjava.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjava.src,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optjsearch.cxx b/svx/source/cui/optjsearch.cxx
index 720fa6eec5..84bab84f9d 100644
--- a/svx/source/cui/optjsearch.cxx
+++ b/svx/source/cui/optjsearch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjsearch.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optjsearch.hxx b/svx/source/cui/optjsearch.hxx
index f7b628692d..fa841472a6 100644
--- a/svx/source/cui/optjsearch.hxx
+++ b/svx/source/cui/optjsearch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjsearch.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optmemory.cxx b/svx/source/cui/optmemory.cxx
index e3befab80e..b95b5d92ad 100644
--- a/svx/source/cui/optmemory.cxx
+++ b/svx/source/cui/optmemory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optmemory.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optmemory.hrc b/svx/source/cui/optmemory.hrc
index b5527a3396..185623fea3 100644
--- a/svx/source/cui/optmemory.hrc
+++ b/svx/source/cui/optmemory.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optmemory.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optmemory.hxx b/svx/source/cui/optmemory.hxx
index 75ca43f25a..4beebdd8c3 100644
--- a/svx/source/cui/optmemory.hxx
+++ b/svx/source/cui/optmemory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optmemory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optmemory.src b/svx/source/cui/optmemory.src
index 01d23d42be..1396e832ec 100644
--- a/svx/source/cui/optmemory.src
+++ b/svx/source/cui/optmemory.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optmemory.src,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optpath.cxx b/svx/source/cui/optpath.cxx
index ec589678b2..ecb9851ea1 100644
--- a/svx/source/cui/optpath.cxx
+++ b/svx/source/cui/optpath.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optpath.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optpath.hxx b/svx/source/cui/optpath.hxx
index 5c51e2f214..01f987cb38 100644
--- a/svx/source/cui/optpath.hxx
+++ b/svx/source/cui/optpath.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optpath.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optsave.cxx b/svx/source/cui/optsave.cxx
index 18385e584b..70d5524892 100644
--- a/svx/source/cui/optsave.cxx
+++ b/svx/source/cui/optsave.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optsave.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optsave.hxx b/svx/source/cui/optsave.hxx
index 4971ccc68a..ed2909f75e 100644
--- a/svx/source/cui/optsave.hxx
+++ b/svx/source/cui/optsave.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optsave.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optupdt.cxx b/svx/source/cui/optupdt.cxx
index 25668f4149..a85649ac76 100644
--- a/svx/source/cui/optupdt.cxx
+++ b/svx/source/cui/optupdt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optupdt.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optupdt.hrc b/svx/source/cui/optupdt.hrc
index 11c956e8c3..d301aa0731 100644
--- a/svx/source/cui/optupdt.hrc
+++ b/svx/source/cui/optupdt.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optupdt.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optupdt.hxx b/svx/source/cui/optupdt.hxx
index eeb8203bcf..4b02440847 100644
--- a/svx/source/cui/optupdt.hxx
+++ b/svx/source/cui/optupdt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optupdt.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/optupdt.src b/svx/source/cui/optupdt.src
index b6512a83a0..6c9f5eecc4 100644
--- a/svx/source/cui/optupdt.src
+++ b/svx/source/cui/optupdt.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optupdt.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/page.cxx b/svx/source/cui/page.cxx
index 2ebbf8bcde..f9fd29a6ab 100644
--- a/svx/source/cui/page.cxx
+++ b/svx/source/cui/page.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: page.cxx,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/page.h b/svx/source/cui/page.h
index 1df26b13b2..b7c93dcd8f 100644
--- a/svx/source/cui/page.h
+++ b/svx/source/cui/page.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: page.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/page.hrc b/svx/source/cui/page.hrc
index bee5c13345..79a619c5db 100644
--- a/svx/source/cui/page.hrc
+++ b/svx/source/cui/page.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: page.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/page.hxx b/svx/source/cui/page.hxx
index 5be2c4d63f..a60e5ed33c 100644
--- a/svx/source/cui/page.hxx
+++ b/svx/source/cui/page.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: page.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/page.src b/svx/source/cui/page.src
index 2da8922d42..3dd0bd6df4 100644
--- a/svx/source/cui/page.src
+++ b/svx/source/cui/page.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: page.src,v $
- * $Revision: 1.71 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/paragrph.cxx b/svx/source/cui/paragrph.cxx
index 29ec73d233..bcc9c0120a 100644
--- a/svx/source/cui/paragrph.cxx
+++ b/svx/source/cui/paragrph.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paragrph.cxx,v $
- * $Revision: 1.54 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/paragrph.hrc b/svx/source/cui/paragrph.hrc
index 7314cea6ce..b5fa006a0c 100644
--- a/svx/source/cui/paragrph.hrc
+++ b/svx/source/cui/paragrph.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paragrph.hrc,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/paragrph.hxx b/svx/source/cui/paragrph.hxx
index 438a741100..afc58b4dd0 100644
--- a/svx/source/cui/paragrph.hxx
+++ b/svx/source/cui/paragrph.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paragrph.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/paragrph.src b/svx/source/cui/paragrph.src
index 51320cb820..fa0c4c2b1b 100644
--- a/svx/source/cui/paragrph.src
+++ b/svx/source/cui/paragrph.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paragrph.src,v $
- * $Revision: 1.85 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/pastedlg.cxx b/svx/source/cui/pastedlg.cxx
index f664f2024f..86da148c39 100644
--- a/svx/source/cui/pastedlg.cxx
+++ b/svx/source/cui/pastedlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pastedlg.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/pastedlg.hxx b/svx/source/cui/pastedlg.hxx
index 443807d86e..4ae164e90c 100644
--- a/svx/source/cui/pastedlg.hxx
+++ b/svx/source/cui/pastedlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pastedlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/plfilter.cxx b/svx/source/cui/plfilter.cxx
index 2c8b4c86bf..65b6004c43 100644
--- a/svx/source/cui/plfilter.cxx
+++ b/svx/source/cui/plfilter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: plfilter.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/postdlg.cxx b/svx/source/cui/postdlg.cxx
index 24545df391..ac6b728d54 100644
--- a/svx/source/cui/postdlg.cxx
+++ b/svx/source/cui/postdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postdlg.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/postdlg.hrc b/svx/source/cui/postdlg.hrc
index 3036fe1870..71f7e97e8e 100644
--- a/svx/source/cui/postdlg.hrc
+++ b/svx/source/cui/postdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postdlg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/postdlg.hxx b/svx/source/cui/postdlg.hxx
index 85e71d255c..2767edf9a8 100644
--- a/svx/source/cui/postdlg.hxx
+++ b/svx/source/cui/postdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postdlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/postdlg.src b/svx/source/cui/postdlg.src
index 50536b34ec..641a901043 100644
--- a/svx/source/cui/postdlg.src
+++ b/svx/source/cui/postdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postdlg.src,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/readonlyimage.cxx b/svx/source/cui/readonlyimage.cxx
index 77e842cac7..8d924cb288 100644
--- a/svx/source/cui/readonlyimage.cxx
+++ b/svx/source/cui/readonlyimage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: readonlyimage.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/readonlyimage.hxx b/svx/source/cui/readonlyimage.hxx
index ec509b5f00..8c835bce8f 100644
--- a/svx/source/cui/readonlyimage.hxx
+++ b/svx/source/cui/readonlyimage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: readonlyimage.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/readonlyimage.src b/svx/source/cui/readonlyimage.src
index 306e4f6ed9..ab117f7f19 100644
--- a/svx/source/cui/readonlyimage.src
+++ b/svx/source/cui/readonlyimage.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: readonlyimage.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/scriptdlg.cxx b/svx/source/cui/scriptdlg.cxx
index 09b00a1cb8..be061b0bfa 100644
--- a/svx/source/cui/scriptdlg.cxx
+++ b/svx/source/cui/scriptdlg.cxx
@@ -1,13 +1,10 @@
 /**********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptdlg.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/scriptdlg.hrc b/svx/source/cui/scriptdlg.hrc
index af327d5705..5eab0eca8c 100644
--- a/svx/source/cui/scriptdlg.hrc
+++ b/svx/source/cui/scriptdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptdlg.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/scriptdlg.hxx b/svx/source/cui/scriptdlg.hxx
index a3dde1787b..8983203905 100644
--- a/svx/source/cui/scriptdlg.hxx
+++ b/svx/source/cui/scriptdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptdlg.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/scriptdlg.src b/svx/source/cui/scriptdlg.src
index 112d5861c3..c3fc803f53 100644
--- a/svx/source/cui/scriptdlg.src
+++ b/svx/source/cui/scriptdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scriptdlg.src,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/sdbcdriverenum.cxx b/svx/source/cui/sdbcdriverenum.cxx
index 1fc0335ed3..7b219a4888 100644
--- a/svx/source/cui/sdbcdriverenum.cxx
+++ b/svx/source/cui/sdbcdriverenum.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdbcdriverenum.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/sdbcdriverenum.hxx b/svx/source/cui/sdbcdriverenum.hxx
index 447fa70051..b08de7c6d6 100644
--- a/svx/source/cui/sdbcdriverenum.hxx
+++ b/svx/source/cui/sdbcdriverenum.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdbcdriverenum.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/sdrcelldlg.cxx b/svx/source/cui/sdrcelldlg.cxx
index f5e9f719ce..fb426abb93 100644
--- a/svx/source/cui/sdrcelldlg.cxx
+++ b/svx/source/cui/sdrcelldlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrcelldlg.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/sdrcelldlg.hxx b/svx/source/cui/sdrcelldlg.hxx
index 6633066585..4dfa42750b 100644
--- a/svx/source/cui/sdrcelldlg.hxx
+++ b/svx/source/cui/sdrcelldlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrcelldlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/sdrcelldlg.src b/svx/source/cui/sdrcelldlg.src
index f657697bd4..aa7cd60e39 100644
--- a/svx/source/cui/sdrcelldlg.src
+++ b/svx/source/cui/sdrcelldlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrcelldlg.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/securityoptions.cxx b/svx/source/cui/securityoptions.cxx
index 8689d911ec..329713967d 100644
--- a/svx/source/cui/securityoptions.cxx
+++ b/svx/source/cui/securityoptions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: securityoptions.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/securityoptions.hrc b/svx/source/cui/securityoptions.hrc
index 50133cc9b9..8b657b3a22 100644
--- a/svx/source/cui/securityoptions.hrc
+++ b/svx/source/cui/securityoptions.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: securityoptions.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/securityoptions.hxx b/svx/source/cui/securityoptions.hxx
index d93bf33352..aa2c189c67 100644
--- a/svx/source/cui/securityoptions.hxx
+++ b/svx/source/cui/securityoptions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: securityoptions.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/securityoptions.src b/svx/source/cui/securityoptions.src
index bb74567f2f..63a361ece0 100644
--- a/svx/source/cui/securityoptions.src
+++ b/svx/source/cui/securityoptions.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: securityoptions.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/selector.cxx b/svx/source/cui/selector.cxx
index 83e0e33bd8..6fa43dcd08 100644
--- a/svx/source/cui/selector.cxx
+++ b/svx/source/cui/selector.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selector.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/selector.hrc b/svx/source/cui/selector.hrc
index 4a15588796..4e95ed5399 100644
--- a/svx/source/cui/selector.hrc
+++ b/svx/source/cui/selector.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selector.hrc,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/selector.hxx b/svx/source/cui/selector.hxx
index b649a8e306..b1d207d878 100644
--- a/svx/source/cui/selector.hxx
+++ b/svx/source/cui/selector.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selector.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/selector.src b/svx/source/cui/selector.src
index 1a08f8cb3e..ab17e88ff7 100644
--- a/svx/source/cui/selector.src
+++ b/svx/source/cui/selector.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selector.src,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/showcols.cxx b/svx/source/cui/showcols.cxx
index af6f4a54ea..3967328192 100644
--- a/svx/source/cui/showcols.cxx
+++ b/svx/source/cui/showcols.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: showcols.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/showcols.hxx b/svx/source/cui/showcols.hxx
index 0d21863cba..7b92cb1020 100644
--- a/svx/source/cui/showcols.hxx
+++ b/svx/source/cui/showcols.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: showcols.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/splitcelldlg.cxx b/svx/source/cui/splitcelldlg.cxx
index b746b7d650..26d9cc2231 100644
--- a/svx/source/cui/splitcelldlg.cxx
+++ b/svx/source/cui/splitcelldlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitcelldlg.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/splitcelldlg.hrc b/svx/source/cui/splitcelldlg.hrc
index 7a0c7929b7..7f058fa54f 100644
--- a/svx/source/cui/splitcelldlg.hrc
+++ b/svx/source/cui/splitcelldlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitcelldlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/splitcelldlg.hxx b/svx/source/cui/splitcelldlg.hxx
index d5b9e64ab3..a453572ff0 100644
--- a/svx/source/cui/splitcelldlg.hxx
+++ b/svx/source/cui/splitcelldlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitcelldlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/splitcelldlg.src b/svx/source/cui/splitcelldlg.src
index 6d6660564b..762ec8ba97 100644
--- a/svx/source/cui/splitcelldlg.src
+++ b/svx/source/cui/splitcelldlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splitcelldlg.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/srchxtra.cxx b/svx/source/cui/srchxtra.cxx
index ae5f2d7365..9e2f2eb9b8 100644
--- a/svx/source/cui/srchxtra.cxx
+++ b/svx/source/cui/srchxtra.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchxtra.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/srchxtra.hrc b/svx/source/cui/srchxtra.hrc
index c3e7ad5b58..5df6d9bd47 100644
--- a/svx/source/cui/srchxtra.hrc
+++ b/svx/source/cui/srchxtra.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchxtra.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/srchxtra.hxx b/svx/source/cui/srchxtra.hxx
index ce6a500d68..4779ac5703 100644
--- a/svx/source/cui/srchxtra.hxx
+++ b/svx/source/cui/srchxtra.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchxtra.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/srchxtra.src b/svx/source/cui/srchxtra.src
index 2faf01b302..0e6e8e54c0 100644
--- a/svx/source/cui/srchxtra.src
+++ b/svx/source/cui/srchxtra.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchxtra.src,v $
- * $Revision: 1.52 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/svuidlg.hrc b/svx/source/cui/svuidlg.hrc
index b4f40e15ab..09d4836e13 100644
--- a/svx/source/cui/svuidlg.hrc
+++ b/svx/source/cui/svuidlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svuidlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/svuidlg.src b/svx/source/cui/svuidlg.src
index eeff7e33d0..897be1ac10 100644
--- a/svx/source/cui/svuidlg.src
+++ b/svx/source/cui/svuidlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svuidlg.src,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/swpossizetabpage.cxx b/svx/source/cui/swpossizetabpage.cxx
index b3aecc4405..c16c2e6fba 100644
--- a/svx/source/cui/swpossizetabpage.cxx
+++ b/svx/source/cui/swpossizetabpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swpossizetabpage.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/swpossizetabpage.hrc b/svx/source/cui/swpossizetabpage.hrc
index 1d82fd778c..9c5170b21d 100644
--- a/svx/source/cui/swpossizetabpage.hrc
+++ b/svx/source/cui/swpossizetabpage.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swpossizetabpage.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/swpossizetabpage.hxx b/svx/source/cui/swpossizetabpage.hxx
index 34aff3b988..5503736d81 100644
--- a/svx/source/cui/swpossizetabpage.hxx
+++ b/svx/source/cui/swpossizetabpage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swpossizetabpage.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/swpossizetabpage.src b/svx/source/cui/swpossizetabpage.src
index fad98467ce..505e7cf3c3 100644
--- a/svx/source/cui/swpossizetabpage.src
+++ b/svx/source/cui/swpossizetabpage.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swpossizetabpage.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabarea.cxx b/svx/source/cui/tabarea.cxx
index 721154a9a9..405b34d86e 100644
--- a/svx/source/cui/tabarea.cxx
+++ b/svx/source/cui/tabarea.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabarea.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabarea.hrc b/svx/source/cui/tabarea.hrc
index a5afbd8b29..5a977d293a 100644
--- a/svx/source/cui/tabarea.hrc
+++ b/svx/source/cui/tabarea.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabarea.hrc,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabarea.src b/svx/source/cui/tabarea.src
index 16d46fd896..8b5e7fb93a 100644
--- a/svx/source/cui/tabarea.src
+++ b/svx/source/cui/tabarea.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabarea.src,v $
- * $Revision: 1.65 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabline.cxx b/svx/source/cui/tabline.cxx
index 2479a22956..8507bf377c 100644
--- a/svx/source/cui/tabline.cxx
+++ b/svx/source/cui/tabline.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabline.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabline.hrc b/svx/source/cui/tabline.hrc
index 1d35fc6f26..28012270dc 100644
--- a/svx/source/cui/tabline.hrc
+++ b/svx/source/cui/tabline.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabline.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabline.src b/svx/source/cui/tabline.src
index 18275630c9..103f989e65 100644
--- a/svx/source/cui/tabline.src
+++ b/svx/source/cui/tabline.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabline.src,v $
- * $Revision: 1.45 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabstpge.cxx b/svx/source/cui/tabstpge.cxx
index 24a4a1ba90..b3a6a07ecf 100644
--- a/svx/source/cui/tabstpge.cxx
+++ b/svx/source/cui/tabstpge.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabstpge.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabstpge.hrc b/svx/source/cui/tabstpge.hrc
index eb75e2cc41..639845da96 100644
--- a/svx/source/cui/tabstpge.hrc
+++ b/svx/source/cui/tabstpge.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabstpge.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabstpge.hxx b/svx/source/cui/tabstpge.hxx
index 0ab6265c67..77136d2299 100644
--- a/svx/source/cui/tabstpge.hxx
+++ b/svx/source/cui/tabstpge.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabstpge.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tabstpge.src b/svx/source/cui/tabstpge.src
index 4cb09d5bf1..45c56e9081 100644
--- a/svx/source/cui/tabstpge.src
+++ b/svx/source/cui/tabstpge.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabstpge.src,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textanim.cxx b/svx/source/cui/textanim.cxx
index 89157236b4..dee793a0fa 100644
--- a/svx/source/cui/textanim.cxx
+++ b/svx/source/cui/textanim.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textanim.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textanim.hrc b/svx/source/cui/textanim.hrc
index bcbecf8e03..2f29d81a14 100644
--- a/svx/source/cui/textanim.hrc
+++ b/svx/source/cui/textanim.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textanim.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textanim.hxx b/svx/source/cui/textanim.hxx
index f72d474c76..49abc12af1 100644
--- a/svx/source/cui/textanim.hxx
+++ b/svx/source/cui/textanim.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textanim.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textanim.src b/svx/source/cui/textanim.src
index fb29d9c60d..cf8d28acb2 100644
--- a/svx/source/cui/textanim.src
+++ b/svx/source/cui/textanim.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textanim.src,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textattr.cxx b/svx/source/cui/textattr.cxx
index a0e9d2b585..11e9b122bb 100644
--- a/svx/source/cui/textattr.cxx
+++ b/svx/source/cui/textattr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textattr.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textattr.hrc b/svx/source/cui/textattr.hrc
index a288f2befd..b5da04f607 100644
--- a/svx/source/cui/textattr.hrc
+++ b/svx/source/cui/textattr.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textattr.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textattr.hxx b/svx/source/cui/textattr.hxx
index 63ef963b81..c7381d911a 100644
--- a/svx/source/cui/textattr.hxx
+++ b/svx/source/cui/textattr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textattr.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/textattr.src b/svx/source/cui/textattr.src
index 293dad2462..2f64780422 100644
--- a/svx/source/cui/textattr.src
+++ b/svx/source/cui/textattr.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textattr.src,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tparea.cxx b/svx/source/cui/tparea.cxx
index 961c878df2..ea8d9d04d1 100644
--- a/svx/source/cui/tparea.cxx
+++ b/svx/source/cui/tparea.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tparea.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tpbitmap.cxx b/svx/source/cui/tpbitmap.cxx
index febfa18e90..095f01de81 100644
--- a/svx/source/cui/tpbitmap.cxx
+++ b/svx/source/cui/tpbitmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tpbitmap.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tpcolor.cxx b/svx/source/cui/tpcolor.cxx
index a373c985f3..b951c4e796 100644
--- a/svx/source/cui/tpcolor.cxx
+++ b/svx/source/cui/tpcolor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tpcolor.cxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tpgradnt.cxx b/svx/source/cui/tpgradnt.cxx
index 99f8b357b8..b2feb06096 100644
--- a/svx/source/cui/tpgradnt.cxx
+++ b/svx/source/cui/tpgradnt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tpgradnt.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tphatch.cxx b/svx/source/cui/tphatch.cxx
index 42f576836b..62df8770dd 100644
--- a/svx/source/cui/tphatch.cxx
+++ b/svx/source/cui/tphatch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tphatch.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tpline.cxx b/svx/source/cui/tpline.cxx
index 497d628fa3..3ec3be1f9a 100644
--- a/svx/source/cui/tpline.cxx
+++ b/svx/source/cui/tpline.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tpline.cxx,v $
- * $Revision: 1.45 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tplnedef.cxx b/svx/source/cui/tplnedef.cxx
index e370b4a8c8..5621fb31ec 100644
--- a/svx/source/cui/tplnedef.cxx
+++ b/svx/source/cui/tplnedef.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplnedef.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tplneend.cxx b/svx/source/cui/tplneend.cxx
index e30e5b9e8d..f7416480c0 100644
--- a/svx/source/cui/tplneend.cxx
+++ b/svx/source/cui/tplneend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tplneend.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/tpshadow.cxx b/svx/source/cui/tpshadow.cxx
index 2ff6d10fb3..4f89057de9 100644
--- a/svx/source/cui/tpshadow.cxx
+++ b/svx/source/cui/tpshadow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tpshadow.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/transfrm.cxx b/svx/source/cui/transfrm.cxx
index 538e8eb523..53b3a52aba 100644
--- a/svx/source/cui/transfrm.cxx
+++ b/svx/source/cui/transfrm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transfrm.cxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/transfrm.hrc b/svx/source/cui/transfrm.hrc
index a76cdb9cba..8cd4fcd154 100644
--- a/svx/source/cui/transfrm.hrc
+++ b/svx/source/cui/transfrm.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transfrm.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/transfrm.hxx b/svx/source/cui/transfrm.hxx
index 8b25e2cee0..d1306fed94 100644
--- a/svx/source/cui/transfrm.hxx
+++ b/svx/source/cui/transfrm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transfrm.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/transfrm.src b/svx/source/cui/transfrm.src
index 4fd301d219..332ee6ad96 100644
--- a/svx/source/cui/transfrm.src
+++ b/svx/source/cui/transfrm.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transfrm.src,v $
- * $Revision: 1.57 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/treeopt.cxx b/svx/source/cui/treeopt.cxx
index 52d47523ed..41af73742b 100644
--- a/svx/source/cui/treeopt.cxx
+++ b/svx/source/cui/treeopt.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: treeopt.cxx,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/treeopt.hrc b/svx/source/cui/treeopt.hrc
index 8fe50334ba..732ac1a26f 100644
--- a/svx/source/cui/treeopt.hrc
+++ b/svx/source/cui/treeopt.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeopt.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/treeopt.hxx b/svx/source/cui/treeopt.hxx
index 014cb6e22b..d72b7eb5be 100644
--- a/svx/source/cui/treeopt.hxx
+++ b/svx/source/cui/treeopt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: treeopt.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/treeopt.src b/svx/source/cui/treeopt.src
index be5398f5f5..0ae44c5a49 100644
--- a/svx/source/cui/treeopt.src
+++ b/svx/source/cui/treeopt.src
@@ -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: treeopt.src,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/cui/webconninfo.cxx b/svx/source/cui/webconninfo.cxx
index 33bd7f8925..add0b600ed 100644
--- a/svx/source/cui/webconninfo.cxx
+++ b/svx/source/cui/webconninfo.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: webconninfo.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/svx/source/cui/webconninfo.hrc b/svx/source/cui/webconninfo.hrc
index d4be1e151b..85cbf35afc 100644
--- a/svx/source/cui/webconninfo.hrc
+++ b/svx/source/cui/webconninfo.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webconninfo.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/webconninfo.hxx b/svx/source/cui/webconninfo.hxx
index 3ee7e50458..569bb653d6 100644
--- a/svx/source/cui/webconninfo.hxx
+++ b/svx/source/cui/webconninfo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webconninfo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/webconninfo.src b/svx/source/cui/webconninfo.src
index e5411d4542..80d92ea06e 100644
--- a/svx/source/cui/webconninfo.src
+++ b/svx/source/cui/webconninfo.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webconninfo.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/winpluginlib.cpp b/svx/source/cui/winpluginlib.cpp
index 17928c161b..df083a5348 100644
--- a/svx/source/cui/winpluginlib.cpp
+++ b/svx/source/cui/winpluginlib.cpp
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: winpluginlib.cpp,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/zoom.cxx b/svx/source/cui/zoom.cxx
index 78fc77a336..383d10c217 100644
--- a/svx/source/cui/zoom.cxx
+++ b/svx/source/cui/zoom.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoom.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/zoom.hrc b/svx/source/cui/zoom.hrc
index 6e3cf49d7c..49412ad085 100644
--- a/svx/source/cui/zoom.hrc
+++ b/svx/source/cui/zoom.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoom.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/zoom.hxx b/svx/source/cui/zoom.hxx
index 6565214e54..d4c09c7ebc 100644
--- a/svx/source/cui/zoom.hxx
+++ b/svx/source/cui/zoom.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoom.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/cui/zoom.src b/svx/source/cui/zoom.src
index 197d1e2f29..a592474d9c 100644
--- a/svx/source/cui/zoom.src
+++ b/svx/source/cui/zoom.src
@@ -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: zoom.src,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index ed0b16bb82..ab2d4e7fb0 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShape2d.cxx,v $
- * $Revision: 1.31.146.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index e8f40b49dd..80f9c421c8 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShape2d.hxx,v $
- * $Revision: 1.11.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 4fec059147..3da5ad265b 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShape3d.cxx,v $
- * $Revision: 1.19.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 45d98d9e4c..0439672ef0 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShape3d.hxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 2fad91e12e..b9d6df4ef3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeEngine.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index 2666d7f1e6..8a9731dc40 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeEngine.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 1769009824..11f832ee50 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeFontWork.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
index 4ee4f4657c..8d96aceedd 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeFontWork.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index d9db4812e8..9c26314f08 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeFunctionParser.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 548c09b295..2d5f3ec4e1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeGeometry.cxx,v $
- * $Revision: 1.23.92.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
index d216c5bb48..8da3b312ba 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeGeometry.hxx,v $
- * $Revision: 1.8.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index b6b0a54fbc..bf446ce304 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeHandle.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 0cb681cc13..fbc1481a3d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeHandle.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 588e8a3207..b87d8e6b00 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeTypeNames.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
index a24f11ebf0..054af2e3af 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeTypeNames.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk
index edd6f7d33e..9f0e6b252c 100644
--- a/svx/source/customshapes/makefile.mk
+++ b/svx/source/customshapes/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index a663bc6fcf..a9a1accfdc 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxcustomshapes.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index d5e99df857..9361af4d76 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellDialogChildWindow.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 1b33ad47ac..fbeeba4339 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _bmpmask.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index a81eba3cb1..a2f8d02acd 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _contdlg.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index 934a0f60f2..e84803ce48 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bmpmask.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index 23fe9df291..eed11eb2b4 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bmpmask.src,v $
- * $Revision: 1.46 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 7258c2ca4a..9f7a454af1 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charmap.cxx,v $
- * $Revision: 1.44 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index e48736bf37..fd8e334340 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: checklbx.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 2005cfb043..023de0269e 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connctrl.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index 946282e7e3..87eb96cc99 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contdlg.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index b2c663cc8c..350ba5b4a3 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contdlg.src,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index dd88d823b5..4b7f2021e1 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contimp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 692a961cf0..bf0b1aa8f4 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contwnd.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 29ebe78618..a69dc12019 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contwnd.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 7a695c550c..3ee1215590 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ctredlin.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index eef45668cc..6daddec115 100644
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ctredlin.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 8b49dc708d..95061ccd52 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ctredlin.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 84f5debf8c..358e025764 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: databaseregistrationui.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 001bcb04b8..0d5e6ed4bd 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialcontrol.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index becd5ad806..242885cb97 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dialmgr.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index fe75592b6e..09f03b1360 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgctl3d.cxx,v $
- * $Revision: 1.20.226.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 2d3b9d33b4..bf9cb44e0a 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgctrl.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src
index a23922b4b3..2da544673c 100644
--- a/svx/source/dialog/dlgctrl.src
+++ b/svx/source/dialog/dlgctrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgctrl.src,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 57e9296dbe..2c228af5f2 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dlgutil.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index cd828cfaa8..61e987b1c0 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.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: docrecovery.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index 07587d25af..965287b44c 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docrecovery.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index a5698ad742..5bcde8bdf0 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: docrecovery.src,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index d76dd9a4a2..3fd0b4ac13 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fntctrl.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 1358080600..6443c12b42 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.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: fontlb.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/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index c361d97426..cc3a157e24 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontwork.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc
index 6009830617..d328cfa93d 100644
--- a/svx/source/dialog/fontwork.hrc
+++ b/svx/source/dialog/fontwork.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontwork.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 10349f389b..555763df4f 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontwork.src,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 2fe4d8187d..0e68b21a7f 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framelink.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index b0b25d8355..a449c778f7 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: framelinkarray.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 69d5149758..dcfc14afca 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdirlbox.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/frmdirlbox.src b/svx/source/dialog/frmdirlbox.src
index f9d5d4bedf..a23c392efc 100644
--- a/svx/source/dialog/frmdirlbox.src
+++ b/svx/source/dialog/frmdirlbox.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmdirlbox.src,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 88bbbb8ef2..21923b4919 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmsel.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
index 7e649f6291..754e0b962b 100644
--- a/svx/source/dialog/frmsel.src
+++ b/svx/source/dialog/frmsel.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmsel.src,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index f83c7608ac..902d3091bd 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphctl.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 583de9a93e..e1576c480f 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfflt.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx
index cb7ef22f73..279d32f0c9 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/svx/source/dialog/hangulhanja.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: hangulhanja.cxx,v $
- * $Revision: 1.20.102.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 9ba5238dea..aba5dbc078 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hdft.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc
index aa48cf962a..0bff9daa55 100644
--- a/svx/source/dialog/hdft.hrc
+++ b/svx/source/dialog/hdft.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hdft.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index 4170534e84..e93d18ff35 100644
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hdft.src,v $
- * $Revision: 1.52 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index efbe2e850b..4d41c85bf8 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyperdlg.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyperdlg.src b/svx/source/dialog/hyperdlg.src
index 780488347c..97956e0ad7 100644
--- a/svx/source/dialog/hyperdlg.src
+++ b/svx/source/dialog/hyperdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyperdlg.src,v $
- * $Revision: 1.78 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyphen.cxx b/svx/source/dialog/hyphen.cxx
index 81ae5961cf..cf74b3d15b 100644
--- a/svx/source/dialog/hyphen.cxx
+++ b/svx/source/dialog/hyphen.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: hyphen.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/svx/source/dialog/hyphen.hrc b/svx/source/dialog/hyphen.hrc
index 9cd708b89d..b8bf037d81 100644
--- a/svx/source/dialog/hyphen.hrc
+++ b/svx/source/dialog/hyphen.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphen.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyphen.hxx b/svx/source/dialog/hyphen.hxx
index e872bfae28..de493bdbd6 100644
--- a/svx/source/dialog/hyphen.hxx
+++ b/svx/source/dialog/hyphen.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphen.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyphen.src b/svx/source/dialog/hyphen.src
index de3caed135..e554053c9a 100644
--- a/svx/source/dialog/hyphen.src
+++ b/svx/source/dialog/hyphen.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyphen.src,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index e526bd86a7..32cfe37ef5 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyprdlg.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index ee7c272fcc..aa7cce46b2 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyprlink.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyprlink.hrc b/svx/source/dialog/hyprlink.hrc
index dd3a1be9c4..496ec1ecab 100644
--- a/svx/source/dialog/hyprlink.hrc
+++ b/svx/source/dialog/hyprlink.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyprlink.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyprlink.hxx b/svx/source/dialog/hyprlink.hxx
index 21ece8bc21..0a5af0afae 100644
--- a/svx/source/dialog/hyprlink.hxx
+++ b/svx/source/dialog/hyprlink.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyprlink.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
index 2eaafcaadc..abefc7832d 100644
--- a/svx/source/dialog/hyprlink.src
+++ b/svx/source/dialog/hyprlink.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyprlink.src,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 9cf1e4cb46..5049b3ce0e 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapdlg.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 80eee9e319..da2ea910d2 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapdlg.hrc,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index cc40d30b51..a2f1a45e8b 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapdlg.src,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index a6190c96c1..23beddefdf 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapimp.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 85fe1b9057..dd647e41a3 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapwnd.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 31d108dfe0..dee5f373e8 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imapwnd.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
index b60c391f00..cdf3a3e059 100644
--- a/svx/source/dialog/impgrf.cxx
+++ b/svx/source/dialog/impgrf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impgrf.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/impgrf.hrc b/svx/source/dialog/impgrf.hrc
index 91ab0e4ff6..55cc83ea2b 100644
--- a/svx/source/dialog/impgrf.hrc
+++ b/svx/source/dialog/impgrf.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impgrf.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/impgrf.src b/svx/source/dialog/impgrf.src
index 430d41dc1b..14267fd698 100644
--- a/svx/source/dialog/impgrf.src
+++ b/svx/source/dialog/impgrf.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impgrf.src,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index b70f498c60..28cfe5862a 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.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: langbox.cxx,v $
- * $Revision: 1.25.132.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index dd2ea2d8d8..79bf1cf010 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: langbox.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src
index 95854d440b..aa2bee89d7 100644
--- a/svx/source/dialog/language.src
+++ b/svx/source/dialog/language.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: language.src,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/lingu.src b/svx/source/dialog/lingu.src
index b1082c46b1..4a7a498a82 100644
--- a/svx/source/dialog/lingu.src
+++ b/svx/source/dialog/lingu.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lingu.src,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index c54081365a..4e6b9c1af2 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/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.65 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index c7a4786a0f..563942bdcf 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measctrl.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx
index f6564449ae..785b034e31 100644
--- a/svx/source/dialog/opengrf.cxx
+++ b/svx/source/dialog/opengrf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opengrf.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index d619233246..f546bb95dc 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.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: orienthelper.cxx,v $
- * $Revision: 1.6.274.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index a7cb2f0c69..c4dec033c1 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pagectrl.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index fbe5c771b3..0728185782 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paraprev.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 7c10144048..05c22fefbc 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/passwd.hrc b/svx/source/dialog/passwd.hrc
index ad7e5f4553..7c258be131 100644
--- a/svx/source/dialog/passwd.hrc
+++ b/svx/source/dialog/passwd.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
index 8aabb38066..256628a2ca 100644
--- a/svx/source/dialog/passwd.src
+++ b/svx/source/dialog/passwd.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passwd.src,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index 36972dffb1..9f860e0b32 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pfiledlg.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index cf69a8124d..07f4d2fe99 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prtqry.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src
index 167134c4f5..9ae23f6a4a 100644
--- a/svx/source/dialog/prtqry.src
+++ b/svx/source/dialog/prtqry.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prtqry.src,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/radiobtnbox.cxx b/svx/source/dialog/radiobtnbox.cxx
index dd10431109..0df0ffefa0 100644
--- a/svx/source/dialog/radiobtnbox.cxx
+++ b/svx/source/dialog/radiobtnbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: radiobtnbox.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 08861c093e..564957c12b 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: relfld.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 552d2e862b..7543e4d66c 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rlrcitem.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index e002ddce63..c8595a9249 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rlrcitem.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 5e67d87e28..f177fa5b6e 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rubydialog.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc
index 74c3e91ed3..49842603cd 100644
--- a/svx/source/dialog/rubydialog.hrc
+++ b/svx/source/dialog/rubydialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rubydialog.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src
index 93f9e147fe..6b83f01fc2 100644
--- a/svx/source/dialog/rubydialog.src
+++ b/svx/source/dialog/rubydialog.src
@@ -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: rubydialog.src,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc
index 4b253ff545..1280b1237b 100644
--- a/svx/source/dialog/ruler.hrc
+++ b/svx/source/dialog/ruler.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ruler.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index c88e10c145..4d0218f525 100644
--- a/svx/source/dialog/ruler.src
+++ b/svx/source/dialog/ruler.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ruler.src,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 386e25b739..a95eab5ec8 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rulritem.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 9bf4160b78..8ef2077964 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdstring.src,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/sendreportgen.cxx b/svx/source/dialog/sendreportgen.cxx
index 3fd23ca9b3..f5ca3b4762 100644
--- a/svx/source/dialog/sendreportgen.cxx
+++ b/svx/source/dialog/sendreportgen.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sendreportgen.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx
index 2a1c0b860a..02ae6a6219 100644
--- a/svx/source/dialog/sendreportunx.cxx
+++ b/svx/source/dialog/sendreportunx.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sendreportunx.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index e51ade42cd..d29256f814 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.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: sendreportw32.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/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 4a3ad5e661..d49f7ce1f0 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: simptabl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/splwrap.cxx b/svx/source/dialog/splwrap.cxx
index d22cdb26ad..36e2fb0320 100644
--- a/svx/source/dialog/splwrap.cxx
+++ b/svx/source/dialog/splwrap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: splwrap.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 515959fb03..93f39bd1b7 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchctrl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index a6f1c40a59..bf9e320bfd 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchctrl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 670264aae4..304b257e09 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.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: srchdlg.cxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc
index a903caa868..6632b11fd7 100644
--- a/svx/source/dialog/srchdlg.hrc
+++ b/svx/source/dialog/srchdlg.hrc
@@ -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: srchdlg.hrc,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/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index 2c69a25b92..a91c5c00aa 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -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: srchdlg.src,v $
- * $Revision: 1.75 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index dbd61f619f..0cd6421f5a 100644
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stddlg.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index ed2df90402..47cb66850e 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strarray.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 5f89bbda4e..5fa93103eb 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxbmpnumvalueset.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/svxbox.cxx b/svx/source/dialog/svxbox.cxx
index cb8c4c388f..9e6f90655a 100644
--- a/svx/source/dialog/svxbox.cxx
+++ b/svx/source/dialog/svxbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxbox.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx
index dce467dc94..0a9f326f9e 100644
--- a/svx/source/dialog/svxdlg.cxx
+++ b/svx/source/dialog/svxdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxdlg.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index a7cd91015b..ebf58a2c98 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxgrahicitem.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index f52b8974d9..6edc8fed5a 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxruler.cxx,v $
- * $Revision: 1.39.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index fc72b665ad..3eb350227e 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swframeexample.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 1b1b40fc05..e9418e52b2 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swframeposstrings.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
index 41f220eff8..7c6e7f19bc 100644
--- a/svx/source/dialog/swframeposstrings.src
+++ b/svx/source/dialog/swframeposstrings.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swframeposstrings.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx
index 78fb5fc85a..19bcbdc806 100644
--- a/svx/source/dialog/thesdlg.cxx
+++ b/svx/source/dialog/thesdlg.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: thesdlg.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/thesdlg.hrc b/svx/source/dialog/thesdlg.hrc
index 4ae7e53832..ed29824c4b 100644
--- a/svx/source/dialog/thesdlg.hrc
+++ b/svx/source/dialog/thesdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/thesdlg.src b/svx/source/dialog/thesdlg.src
index c75d95ca5d..f9f6cc93ee 100644
--- a/svx/source/dialog/thesdlg.src
+++ b/svx/source/dialog/thesdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: thesdlg.src,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 7d89f8fa6f..a28f7c3424 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txencbox.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 4c14991468..3fc8270514 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txenctab.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
index 36c4208eba..b7d2ca43f1 100644
--- a/svx/source/dialog/txenctab.src
+++ b/svx/source/dialog/txenctab.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txenctab.src,v $
- * $Revision: 1.49 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index bf2f6d9842..2a47777469 100755..100644
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charmap.src,v $
- * $Revision: 1.57 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
index 53d4b359e9..8c6da9f1ff 100644
--- a/svx/source/dialog/wrapfield.cxx
+++ b/svx/source/dialog/wrapfield.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: wrapfield.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/svx/source/editeng/SvXMLAutoCorrectExport.cxx
index 460212a112..2453bf423c 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx
+++ b/svx/source/editeng/SvXMLAutoCorrectExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SvXMLAutoCorrectExport.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.hxx b/svx/source/editeng/SvXMLAutoCorrectExport.hxx
index 6620168ca3..d9020cf198 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.hxx
+++ b/svx/source/editeng/SvXMLAutoCorrectExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SvXMLAutoCorrectExport.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/svx/source/editeng/SvXMLAutoCorrectImport.cxx
index 692557307d..a08a597485 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx
+++ b/svx/source/editeng/SvXMLAutoCorrectImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SvXMLAutoCorrectImport.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.hxx b/svx/source/editeng/SvXMLAutoCorrectImport.hxx
index 4b1bfb4b5e..f311704318 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.hxx
+++ b/svx/source/editeng/SvXMLAutoCorrectImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SvXMLAutoCorrectImport.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx
index 0745a5e259..3662f81e45 100644
--- a/svx/source/editeng/acorrcfg.cxx
+++ b/svx/source/editeng/acorrcfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: acorrcfg.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editattr.cxx b/svx/source/editeng/editattr.cxx
index 1ac66fb300..5fdc7dceb0 100644
--- a/svx/source/editeng/editattr.cxx
+++ b/svx/source/editeng/editattr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editattr.cxx,v $
- * $Revision: 1.16.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editattr.hxx b/svx/source/editeng/editattr.hxx
index a24b1697c3..8624a98af0 100644
--- a/svx/source/editeng/editattr.hxx
+++ b/svx/source/editeng/editattr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editattr.hxx,v $
- * $Revision: 1.13.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editdbg.cxx b/svx/source/editeng/editdbg.cxx
index c93e7bc63f..c95b510018 100644
--- a/svx/source/editeng/editdbg.cxx
+++ b/svx/source/editeng/editdbg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editdbg.cxx,v $
- * $Revision: 1.22.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx
index eb4e7caf8b..31d3a5d4ac 100644
--- a/svx/source/editeng/editdbg.hxx
+++ b/svx/source/editeng/editdbg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editdbg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx
index d5f9ee16ee..409639158a 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/svx/source/editeng/editdoc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editdoc.cxx,v $
- * $Revision: 1.48.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editdoc.hxx b/svx/source/editeng/editdoc.hxx
index 90efe213b6..e875330b57 100644
--- a/svx/source/editeng/editdoc.hxx
+++ b/svx/source/editeng/editdoc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editdoc.hxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editdoc2.cxx b/svx/source/editeng/editdoc2.cxx
index e0d5fc27e9..868ef91f69 100644
--- a/svx/source/editeng/editdoc2.cxx
+++ b/svx/source/editeng/editdoc2.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: editdoc2.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index 77ae82fde0..b3087e0cad 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.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: editeng.cxx,v $
- * $Revision: 1.117.12.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc
index fa1fa19db7..a0ede86702 100644
--- a/svx/source/editeng/editeng.hrc
+++ b/svx/source/editeng/editeng.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editeng.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editeng.src b/svx/source/editeng/editeng.src
index 1204ba1661..b65f20c365 100644
--- a/svx/source/editeng/editeng.src
+++ b/svx/source/editeng/editeng.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editeng.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx
index d8f0a332b9..e953f5dea9 100644
--- a/svx/source/editeng/editobj.cxx
+++ b/svx/source/editeng/editobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editobj.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx
index b37ceabbd7..4d5dc29b25 100644
--- a/svx/source/editeng/editobj2.hxx
+++ b/svx/source/editeng/editobj2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editobj2.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editsel.cxx b/svx/source/editeng/editsel.cxx
index 90e1ea91d2..d753244e94 100644
--- a/svx/source/editeng/editsel.cxx
+++ b/svx/source/editeng/editsel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editsel.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editsel.hxx b/svx/source/editeng/editsel.hxx
index bc4b78bb1d..2cc6aeedcf 100644
--- a/svx/source/editeng/editsel.hxx
+++ b/svx/source/editeng/editsel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editsel.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editstt2.hxx b/svx/source/editeng/editstt2.hxx
index 896c1768d9..483def35be 100644
--- a/svx/source/editeng/editstt2.hxx
+++ b/svx/source/editeng/editstt2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editstt2.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editundo.cxx b/svx/source/editeng/editundo.cxx
index be57d52112..d318815966 100644
--- a/svx/source/editeng/editundo.cxx
+++ b/svx/source/editeng/editundo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editundo.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editundo.hxx b/svx/source/editeng/editundo.hxx
index 1def47b7e9..71ef3f3708 100644
--- a/svx/source/editeng/editundo.hxx
+++ b/svx/source/editeng/editundo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editundo.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx
index 39cc8debaa..a9e10e115a 100644
--- a/svx/source/editeng/editview.cxx
+++ b/svx/source/editeng/editview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editview.cxx,v $
- * $Revision: 1.52.74.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -1547,53 +1544,53 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
     return bRet;
 }
 
-String EditView::GetSurroundingText() const

-{

-    DBG_CHKTHIS( EditView, 0 );

-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );

-

-    EditSelection aSel( pImpEditView->GetEditSelection() );

-    aSel.Adjust( PIMPEE->GetEditDoc() );

-

-    if( HasSelection() )

-    {

-        XubString aStr = PIMPEE->GetSelected( aSel );

-

-        // Stop reconversion if the selected text includes a line break.

-        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )

-        return aStr;

-        else

-        return String();

-    }

-    else

-    {

-        aSel.Min().SetIndex( 0 );

-        aSel.Max().SetIndex( aSel.Max().GetNode()->Len() );

-        return PIMPEE->GetSelected( aSel );

-    }

-}

-

-Selection EditView::GetSurroundingTextSelection() const

-{

-    DBG_CHKTHIS( EditView, 0 );

-

-    ESelection aSelection( GetSelection() );

-    aSelection.Adjust();

-

-    if( HasSelection() )

-    {

-        EditSelection aSel( pImpEditView->GetEditSelection() );

-        aSel.Adjust( PIMPEE->GetEditDoc() );

-        XubString aStr = PIMPEE->GetSelected( aSel );

-

-        // Stop reconversion if the selected text includes a line break.

-        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )

-        return Selection( 0, aSelection.nEndPos - aSelection.nStartPos );

-        else

-        return Selection( 0, 0 );

-    }

-    else

-    {

-        return Selection( aSelection.nStartPos, aSelection.nEndPos );

-    }

-}

+String EditView::GetSurroundingText() const
+{
+    DBG_CHKTHIS( EditView, 0 );
+    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
+
+    EditSelection aSel( pImpEditView->GetEditSelection() );
+    aSel.Adjust( PIMPEE->GetEditDoc() );
+
+    if( HasSelection() )
+    {
+        XubString aStr = PIMPEE->GetSelected( aSel );
+
+        // Stop reconversion if the selected text includes a line break.
+        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )
+        return aStr;
+        else
+        return String();
+    }
+    else
+    {
+        aSel.Min().SetIndex( 0 );
+        aSel.Max().SetIndex( aSel.Max().GetNode()->Len() );
+        return PIMPEE->GetSelected( aSel );
+    }
+}
+
+Selection EditView::GetSurroundingTextSelection() const
+{
+    DBG_CHKTHIS( EditView, 0 );
+
+    ESelection aSelection( GetSelection() );
+    aSelection.Adjust();
+
+    if( HasSelection() )
+    {
+        EditSelection aSel( pImpEditView->GetEditSelection() );
+        aSel.Adjust( PIMPEE->GetEditDoc() );
+        XubString aStr = PIMPEE->GetSelected( aSel );
+
+        // Stop reconversion if the selected text includes a line break.
+        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )
+        return Selection( 0, aSelection.nEndPos - aSelection.nStartPos );
+        else
+        return Selection( 0, 0 );
+    }
+    else
+    {
+        return Selection( aSelection.nStartPos, aSelection.nEndPos );
+    }
+}
diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx
index 2fb92641ef..d35ed1be44 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/svx/source/editeng/edtspell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: edtspell.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx
index a497b8a5c3..91fa476446 100644
--- a/svx/source/editeng/eehtml.cxx
+++ b/svx/source/editeng/eehtml.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eehtml.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx
index 1396a89307..434311b4fe 100644
--- a/svx/source/editeng/eehtml.hxx
+++ b/svx/source/editeng/eehtml.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eehtml.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eeng_pch.cxx b/svx/source/editeng/eeng_pch.cxx
index d9afbde59b..f86dffb1fd 100644
--- a/svx/source/editeng/eeng_pch.cxx
+++ b/svx/source/editeng/eeng_pch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eeng_pch.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eeng_pch.hxx b/svx/source/editeng/eeng_pch.hxx
index f4dd0ab7f2..18c170d975 100644
--- a/svx/source/editeng/eeng_pch.hxx
+++ b/svx/source/editeng/eeng_pch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eeng_pch.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eeobj.cxx b/svx/source/editeng/eeobj.cxx
index 4079f53348..a0c8d5c3ce 100644
--- a/svx/source/editeng/eeobj.cxx
+++ b/svx/source/editeng/eeobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eeobj.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eeobj.hxx b/svx/source/editeng/eeobj.hxx
index c013d040b3..fb33a515c6 100644
--- a/svx/source/editeng/eeobj.hxx
+++ b/svx/source/editeng/eeobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eeobj.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx
index ce23a1e00e..50043625bf 100644
--- a/svx/source/editeng/eerdll.cxx
+++ b/svx/source/editeng/eerdll.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eerdll.cxx,v $
- * $Revision: 1.31.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eerdll2.hxx b/svx/source/editeng/eerdll2.hxx
index 8b8a584545..fc20a7682e 100644
--- a/svx/source/editeng/eerdll2.hxx
+++ b/svx/source/editeng/eerdll2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eerdll2.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx
index 65c1b6c516..3aae1af55a 100644
--- a/svx/source/editeng/eertfpar.cxx
+++ b/svx/source/editeng/eertfpar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eertfpar.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/eertfpar.hxx b/svx/source/editeng/eertfpar.hxx
index 6969fa62fe..bc2ac43c29 100644
--- a/svx/source/editeng/eertfpar.hxx
+++ b/svx/source/editeng/eertfpar.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eertfpar.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/forbiddencharacterstable.cxx b/svx/source/editeng/forbiddencharacterstable.cxx
index 862e4ec7fd..dc8e557d1e 100644
--- a/svx/source/editeng/forbiddencharacterstable.cxx
+++ b/svx/source/editeng/forbiddencharacterstable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: forbiddencharacterstable.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx
index 51dff075be..c5e3ab59af 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/svx/source/editeng/impedit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impedit.cxx,v $
- * $Revision: 1.64 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx
index adf6afb7c2..7a718bc94c 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/svx/source/editeng/impedit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impedit.hxx,v $
- * $Revision: 1.89.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index 6be5fc0ef0..63280a304c 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.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: impedit2.cxx,v $
- * $Revision: 1.124.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -641,41 +638,41 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             pView->GetWindow()->SetCursorRect();
         }
     }
-    else if ( rCEvt.GetCommand() == COMMAND_SELECTIONCHANGE )

-    {

-        const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData();

-

-        ESelection aSelection = pView->GetSelection();

-        aSelection.Adjust();

-

-        if( pView->HasSelection() )

-        {

-            aSelection.nEndPos = aSelection.nStartPos;

-            aSelection.nStartPos += pData->GetStart();

-            aSelection.nEndPos += pData->GetEnd();

-        }

-        else

-        {

-            aSelection.nStartPos = pData->GetStart();

-            aSelection.nEndPos = pData->GetEnd();

-        }

-        pView->SetSelection( aSelection );

-    }

-    else if ( rCEvt.GetCommand() == COMMAND_PREPARERECONVERSION )

-    {

-        if ( pView->HasSelection() )

-        {

-            ESelection aSelection = pView->GetSelection();

-            aSelection.Adjust();

-

-            if ( aSelection.nStartPara != aSelection.nEndPara )

-            {

-                xub_StrLen aParaLen = pEditEngine->GetTextLen( aSelection.nStartPara );

-                aSelection.nEndPara = aSelection.nStartPara;

-                aSelection.nEndPos = aParaLen;

-                pView->SetSelection( aSelection );

-            }

-        }

+    else if ( rCEvt.GetCommand() == COMMAND_SELECTIONCHANGE )
+    {
+        const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData();
+
+        ESelection aSelection = pView->GetSelection();
+        aSelection.Adjust();
+
+        if( pView->HasSelection() )
+        {
+            aSelection.nEndPos = aSelection.nStartPos;
+            aSelection.nStartPos += pData->GetStart();
+            aSelection.nEndPos += pData->GetEnd();
+        }
+        else
+        {
+            aSelection.nStartPos = pData->GetStart();
+            aSelection.nEndPos = pData->GetEnd();
+        }
+        pView->SetSelection( aSelection );
+    }
+    else if ( rCEvt.GetCommand() == COMMAND_PREPARERECONVERSION )
+    {
+        if ( pView->HasSelection() )
+        {
+            ESelection aSelection = pView->GetSelection();
+            aSelection.Adjust();
+
+            if ( aSelection.nStartPara != aSelection.nEndPara )
+            {
+                xub_StrLen aParaLen = pEditEngine->GetTextLen( aSelection.nStartPara );
+                aSelection.nEndPara = aSelection.nStartPara;
+                aSelection.nEndPos = aParaLen;
+                pView->SetSelection( aSelection );
+            }
+        }
     }
 
     GetSelEngine().Command( rCEvt );
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index 8316d9a94f..d1bce996a1 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.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: impedit3.cxx,v $
- * $Revision: 1.124.82.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx
index 98d8c7eb03..282aa61696 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/svx/source/editeng/impedit4.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impedit4.cxx,v $
- * $Revision: 1.78.54.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx
index fde4e22e8c..9552c2a882 100644
--- a/svx/source/editeng/impedit5.cxx
+++ b/svx/source/editeng/impedit5.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impedit5.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/makefile.mk b/svx/source/editeng/makefile.mk
index 6df91a78f8..70d92002da 100644
--- a/svx/source/editeng/makefile.mk
+++ b/svx/source/editeng/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.18 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx
index b7861e9154..91248e3677 100644
--- a/svx/source/editeng/svxacorr.cxx
+++ b/svx/source/editeng/svxacorr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxacorr.cxx,v $
- * $Revision: 1.62 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/swafopt.cxx b/svx/source/editeng/swafopt.cxx
index 0940a4e736..0a5ae16d63 100644
--- a/svx/source/editeng/swafopt.cxx
+++ b/svx/source/editeng/swafopt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: swafopt.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/textconv.cxx b/svx/source/editeng/textconv.cxx
index 4975b0cf7f..c694760df2 100644
--- a/svx/source/editeng/textconv.cxx
+++ b/svx/source/editeng/textconv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textconv.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/txtrange.cxx b/svx/source/editeng/txtrange.cxx
index f79c3530f6..178ce2a200 100644
--- a/svx/source/editeng/txtrange.cxx
+++ b/svx/source/editeng/txtrange.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtrange.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx
index d6a2d2d96e..5121383ca2 100644
--- a/svx/source/editeng/unolingu.cxx
+++ b/svx/source/editeng/unolingu.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unolingu.cxx,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index a2243e6867..70d82f1272 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: camera3d.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 0f52f80dff..965827c850 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cube3d.cxx,v $
- * $Revision: 1.18.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 920b98efe4..8dbeefced1 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: deflt3d.cxx,v $
- * $Revision: 1.11.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 7bbf9c6ca9..3af1c61498 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dragmt3d.cxx,v $
- * $Revision: 1.12.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx
index c138acdde0..eb09ecd463 100644
--- a/svx/source/engine3d/e3dsceneupdater.cxx
+++ b/svx/source/engine3d/e3dsceneupdater.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dsceneupdater.cxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index a564149499..ce799c9434 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dundo.cxx,v $
- * $Revision: 1.9.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index a08fe4e753..3f041813d0 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrud3d.cxx,v $
- * $Revision: 1.25.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 02a0cf267b..28bf962741 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: float3d.cxx,v $
- * $Revision: 1.27.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index c0f6a579f6..6da555ddcf 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: float3d.src,v $
- * $Revision: 1.67 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index 270e725024..0289b76f51 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helperhittest3d.cxx,v $
- * $Revision: 1.1.2.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx
index 9c31d2ef5e..e2b39de186 100644
--- a/svx/source/engine3d/helperminimaldepth3d.cxx
+++ b/svx/source/engine3d/helperminimaldepth3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helperminimaldepth3d.cxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx
index 6e3ea4b581..7fa1b11a87 100644
--- a/svx/source/engine3d/helperminimaldepth3d.hxx
+++ b/svx/source/engine3d/helperminimaldepth3d.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: helperminimaldepth3d.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 40acc800c4..6ed02ea6e3 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lathe3d.cxx,v $
- * $Revision: 1.27.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
index bb590bd76c..a92c80c58e 100644
--- a/svx/source/engine3d/makefile.mk
+++ b/svx/source/engine3d/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15.18.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 85c35f03cb..770746b389 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: obj3d.cxx,v $
- * $Revision: 1.48.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 70b46cf4f8..373f55363b 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objfac3d.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 68e9e3833a..2e754d256e 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: polygn3d.cxx,v $
- * $Revision: 1.17.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index f43e372e34..51532c229b 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: polysc3d.cxx,v $
- * $Revision: 1.18.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 5079f527bc..a4e7c2a353 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scene3d.cxx,v $
- * $Revision: 1.34.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index b6910274f4..e0d8fd1a6b 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sphere3d.cxx,v $
- * $Revision: 1.20.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src
index 12c97b1925..24b0592730 100644
--- a/svx/source/engine3d/string3d.src
+++ b/svx/source/engine3d/string3d.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: string3d.src,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 75da20585f..c5b1d3fa57 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svx3ditems.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 06eb512996..cf9ee0c442 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: view3d.cxx,v $
- * $Revision: 1.32.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 9e33b281f2..3d3273b69a 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: view3d1.cxx,v $
- * $Revision: 1.15.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/viewpt3d.cxx b/svx/source/engine3d/viewpt3d.cxx
index 1010b44f22..ef9750781a 100644
--- a/svx/source/engine3d/viewpt3d.cxx
+++ b/svx/source/engine3d/viewpt3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewpt3d.cxx,v $
- * $Revision: 1.10.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index a4be774c11..ebf22c81fd 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewpt3d2.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/engine3d/volume3d.cxx b/svx/source/engine3d/volume3d.cxx
index ef4f704d42..04a94b1705 100644
--- a/svx/source/engine3d/volume3d.cxx
+++ b/svx/source/engine3d/volume3d.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: volume3d.cxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 04a2b30b40..754c889386 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbaexchange.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index d30ba00e27..7f4d4c5954 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbaobjectex.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index aee39a7f10..0ef2596673 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.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: fmgridcl.cxx,v $
- * $Revision: 1.64.94.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 649a9f4fa1..483a5e242e 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmgridif.cxx,v $
- * $Revision: 1.59 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 9d8bbdd0fc..1e3e0529fc 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridcell.cxx,v $
- * $Revision: 1.66 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 561be8ab69..608bf38742 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridcols.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index bbd3358d58..237a4403dc 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridctrl.cxx,v $
- * $Revision: 1.85 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 9dc141821f..e974f5b28b 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridctrl.src,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk
index 1e86308f9c..3842a8efb8 100644
--- a/svx/source/fmcomp/makefile.mk
+++ b/svx/source/fmcomp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/fmcomp/showcols.src b/svx/source/fmcomp/showcols.src
index 7f2be7ac3e..3fbd403776 100644
--- a/svx/source/fmcomp/showcols.src
+++ b/svx/source/fmcomp/showcols.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: showcols.src,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index d5e2a0087f..f855111c0b 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: trace.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index ea13227d59..2581078d02 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlexchg.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 2723e11ddc..e681694521 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ParseContext.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/confirmdelete.cxx b/svx/source/form/confirmdelete.cxx
index 1a7604e94a..a54b0f8793 100644
--- a/svx/source/form/confirmdelete.cxx
+++ b/svx/source/form/confirmdelete.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confirmdelete.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index dc12271221..523baab5b2 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dataaccessdescriptor.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index b7d117b3de..c762930b39 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: databaselocationinput.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index 595054855d..244d9d2764 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datalistener.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index c5af260f72..9d939009d7 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datanavi.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 64bc690839..9bb04c3f77 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datanavi.src,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index 9f6b1b7401..d800a8574c 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbcharsethelper.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index c430a2e14a..692c058390 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dbtoolsclient.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index af986d5c54..630a81fd52 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: delayedevent.cxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #include "precompiled_svx.hxx"
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 9c5ddf8280..a8fd3ec07b 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtnav.cxx,v $
- * $Revision: 1.48.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index c93053eee9..82b74e8433 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtnav.src,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index d1f77a84cc..6311f51778 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmPropBrw.cxx,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,20 +28,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmhelp.hrc"

-#include "fmprop.hrc"

+#include "fmhelp.hrc"
+#include "fmprop.hrc"
 #include "fmPropBrw.hxx"
 #include "fmresids.hrc"
 #include "fmservs.hxx"
-#include "fmshimp.hxx"

-#include "fmpgeimp.hxx"

+#include "fmshimp.hxx"
+#include "fmpgeimp.hxx"
 
-#include "svx/dialmgr.hxx"

-#include "svx/fmpage.hxx"

-#include "svx/fmshell.hxx"

-#include "svx/sdrpagewindow.hxx"

-#include "svx/svdpagv.hxx"

-#include "svx/svxids.hrc"

+#include "svx/dialmgr.hxx"
+#include "svx/fmpage.hxx"
+#include "svx/fmshell.hxx"
+#include "svx/sdrpagewindow.hxx"
+#include "svx/svdpagv.hxx"
+#include "svx/svxids.hrc"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -63,20 +60,20 @@
 /** === end UNO includes === **/
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/property.hxx>

+#include <comphelper/property.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/childwin.hxx>
-#include <sfx2/dispatch.hxx>

+#include <sfx2/dispatch.hxx>
 #include <sfx2/objitem.hxx>
-#include <sfx2/objsh.hxx>

-#include <sfx2/viewfrm.hxx>

+#include <sfx2/objsh.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <toolkit/unohlp.hxx>
-#include <tools/debug.hxx>

-#include <tools/diagnose_ex.h>

-#include <tools/shl.hxx>

+#include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/shl.hxx>
 #include <unotools/confignode.hxx>
-#include <vcl/stdtext.hxx>

+#include <vcl/stdtext.hxx>
 
 #include <algorithm>
 
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 17bd103463..28d016e1e1 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.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: fmcontrolbordermanager.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/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index e807f13fcd..7154c5ce8f 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmcontrollayout.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index 5f6c07ce7c..c944dbbccf 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmctrler.cxx,v $
- * $Revision: 1.71 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmdispatch.cxx b/svx/source/form/fmdispatch.cxx
index 5037be5d87..9538701a9d 100644
--- a/svx/source/form/fmdispatch.cxx
+++ b/svx/source/form/fmdispatch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdispatch.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 45a27a6122..199cc03b59 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdmod.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index fb5790c35c..d1ffbc7c0d 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdocumentclassification.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 5765d00bf8..2705afba89 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdpage.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 55d92e07a0..0272303dfa 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmexch.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 8ac29428db..80b18aa2c4 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmexpl.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 2c7c2c00e4..17881727cd 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmexpl.src,v $
- * $Revision: 1.46 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 0d7e562a7d..14170f4c56 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmitems.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 73a1471b26..cbb390fefc 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmmodel.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 5a32ea8314..2cff66a946 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmobj.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index cbbeaae4c5..0628c2da3d 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmobjfac.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 6062e99859..1a4ec7e28a 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmpage.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 9da374d24d..593f047881 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmpgeimp.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 875afd7178..2f84e412d3 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmscriptingenv.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmsearch.src b/svx/source/form/fmsearch.src
index 63a175e04b..c1ce2b6e05 100644
--- a/svx/source/form/fmsearch.src
+++ b/svx/source/form/fmsearch.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsearch.src,v $
- * $Revision: 1.59 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index d41886c844..aa28476da4 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmservs.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 7ae8d6a811..6da4055397 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmshell.cxx,v $
- * $Revision: 1.81 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 645787b518..f783aeacf4 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmshimp.cxx,v $
- * $Revision: 1.94 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 58ad4d641e..ff3268a6ca 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsrccfg.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 66acca4748..100f5a5576 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsrcimp.cxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index e8867d1ef0..83ee71d08a 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmstring.src,v $
- * $Revision: 1.76 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 15a843ee88..d91c95a07a 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtextcontroldialogs.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 1c611bc3ba..1461c74f64 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtextcontrolfeature.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 0c7a416c4b..c2a6fa4504 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtextcontrolshell.cxx,v $
- * $Revision: 1.16.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 6f3c9f5a75..342ca8c48d 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtools.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 2fc7022f73..07ba7688e3 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmundo.cxx,v $
- * $Revision: 1.45 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 26a5ecd7dd..42fe0a38ab 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmview.cxx,v $
- * $Revision: 1.55 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 4f088e4263..aa10e51ee8 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmvwimp.cxx,v $
- * $Revision: 1.72 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 4e28c62a83..479bd4e1e5 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: formcontrolfactory.cxx,v $
-*
-* $Revision: 1.1.2.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 69a2fb308e..d18637fe3e 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formcontrolling.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index f59bdc1bb4..5a7e25e14f 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formshell.src,v $
- * $Revision: 1.10.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 0329eabfa2..b98e63fb2b 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formtoolbars.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index b649be94d1..a1a36a326a 100644
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.35.2.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 232a075ec3..73deaa1c64 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: navigatortree.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index d19e75f923..677e462ffb 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: navigatortreemodel.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index 5c443c7437..4a214d6a25 100644
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdbdatacolumn.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index 41075ec0f2..ec3e5ae72a 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlparserclient.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 0822a5c914..eb799e2b29 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stringlistresource.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 0ad9062461..b5e762db16 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabwin.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index c5a5eb2391..fae3154017 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxform.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/tbxform.src b/svx/source/form/tbxform.src
index 0d52e8c4cb..1ca2307934 100644
--- a/svx/source/form/tbxform.src
+++ b/svx/source/form/tbxform.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxform.src,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx
index d7dc87d615..75a73dc39c 100644
--- a/svx/source/form/typeconversionclient.cxx
+++ b/svx/source/form/typeconversionclient.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: typeconversionclient.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index 0898dcdb2b..59f845eeed 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: typemap.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 0033414540..d310643f2f 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfm_addcondition.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index cd4573d15e..d227c589ff 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: codec.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 1fcc0c8976..80c6f49848 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: codec.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 4260aec4b8..f0837e0af5 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galbrws.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index ff3a01ae6d..c19e0b0e18 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galbrws1.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 289ff4379c..d05e678ffa 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galbrws1.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ca5df8ff16..abd489b164 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galbrws2.cxx,v $
- * $Revision: 1.57 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index abe2e2fd02..9ca81ac7db 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galctrl.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 4facb96b8a..e9a6e106a2 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galexpl.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 422acb973b..6ad34171fa 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallery.src,v $
- * $Revision: 1.79 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 4751c8107f..6cff5ecf9d 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallery1.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/gallerydrawmodel.hxx b/svx/source/gallery2/gallerydrawmodel.hxx
index e5ea60f286..7221565dff 100644
--- a/svx/source/gallery2/gallerydrawmodel.hxx
+++ b/svx/source/gallery2/gallerydrawmodel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gallerydrawmodel.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index c7f058ca80..228ef9f2fe 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galmisc.cxx,v $
- * $Revision: 1.46 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index a4b9cc0d39..8b056bd6a5 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galobj.cxx,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index c76cdce576..9137ebb35e 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galtheme.cxx,v $
- * $Revision: 1.50 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 8156f711c6..bfb1f65d03 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: galtheme.src,v $
- * $Revision: 1.58 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk
index 1da16ff705..5a4d278504 100644
--- a/svx/source/gallery2/makefile.mk
+++ b/svx/source/gallery2/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index a12dc65597..d746e0b89d 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gengal.cxx,v $
- * $Revision: 1.10.288.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index e619ba559a..f98d20e12f 100644
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.sh
@@ -2,14 +2,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: gengal.sh,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5.288.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
index ae1f36e5f7..6f828dccba 100644
--- a/svx/source/gengal/makefile.mk
+++ b/svx/source/gengal/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10.144.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 909d20eb6f..745cd7c627 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleFrameSelector.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/AccessibleStringWrap.hxx b/svx/source/inc/AccessibleStringWrap.hxx
index 0d4e5c42e9..254faa58d2 100644
--- a/svx/source/inc/AccessibleStringWrap.hxx
+++ b/svx/source/inc/AccessibleStringWrap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AccessibleStringWrap.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 3f9c32f283..9b4db5f25c 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DGColorNameLookUp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 85923590f3..d73a557f23 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GraphCtlAccessibleContext.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/SpellDialog.hxx b/svx/source/inc/SpellDialog.hxx
index 351ff3d77e..c722acfe00 100644
--- a/svx/source/inc/SpellDialog.hxx
+++ b/svx/source/inc/SpellDialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SpellDialog.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 517afb1f17..9f8f1e3aa9 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charmapacc.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx
index c822422d26..12d4663425 100644
--- a/svx/source/inc/clonelist.hxx
+++ b/svx/source/inc/clonelist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: clonelist.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/confirmdelete.hxx b/svx/source/inc/confirmdelete.hxx
index c20a2907f3..5a8d0f7a22 100644
--- a/svx/source/inc/confirmdelete.hxx
+++ b/svx/source/inc/confirmdelete.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: confirmdelete.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index 67b1fb2f26..1807aeb0a7 100644
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datalistener.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 80c1befa7d..c4ee1bea9c 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datanavi.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 269db25f47..a24214deb1 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: datanavi.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index be0e5ad4b0..d2a928bffb 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: delayedevent.hxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef SVX_DELAYEDLINK_HXX
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 9d0b624f7e..935a615833 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.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: docrecovery.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/editxml.hxx b/svx/source/inc/editxml.hxx
index 0c02aa6e95..4a69d5e856 100644
--- a/svx/source/inc/editxml.hxx
+++ b/svx/source/inc/editxml.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editxml.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/eventdlg.hxx b/svx/source/inc/eventdlg.hxx
index 7c827be07a..5c73bec0e3 100644
--- a/svx/source/inc/eventdlg.hxx
+++ b/svx/source/inc/eventdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventdlg.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index c84d8d5ae5..d9914415ad 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtnav.hxx,v $
- * $Revision: 1.19.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 78ee4f2e01..bc8faea1bb 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmPropBrw.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 51c426b487..18a495330b 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmcontrolbordermanager.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index 0424046c66..ca9b549ca6 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmcontrollayout.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index 7c127a2adf..45e09ca9bb 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmctrler.hxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmdispatch.hxx b/svx/source/inc/fmdispatch.hxx
index 760ae30573..af6db0266b 100644
--- a/svx/source/inc/fmdispatch.hxx
+++ b/svx/source/inc/fmdispatch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdispatch.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index fdbe026211..d3e766338a 100644
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmdocumentclassification.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 410addcf31..8f17324d48 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmexch.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc
index 41aae9ca1f..73626c3023 100644
--- a/svx/source/inc/fmexpl.hrc
+++ b/svx/source/inc/fmexpl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmexpl.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index bb008a0727..e4c9bc265c 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmexpl.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
index b95580118a..25ff82fd6b 100644
--- a/svx/source/inc/fmgroup.hxx
+++ b/svx/source/inc/fmgroup.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmgroup.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmhlpids.hrc b/svx/source/inc/fmhlpids.hrc
index dedc9bbd5d..eb654b171c 100644
--- a/svx/source/inc/fmhlpids.hrc
+++ b/svx/source/inc/fmhlpids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmhlpids.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 2cbbcb2fe4..07c9ffcb8a 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmitems.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 3dd15fc1cd..a6593d83e2 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmobj.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 9009d2ccad..90678fc1f2 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmpgeimp.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index a981cc65c4..be6c4fe0e6 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmprop.hrc,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index 867d82dd7c..ddb5c9573a 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmresids.hrc,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index 56b5c0e1e3..5834c43713 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmscriptingenv.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmsearch.hrc b/svx/source/inc/fmsearch.hrc
index 97704081ed..36f73e5fcb 100644
--- a/svx/source/inc/fmsearch.hrc
+++ b/svx/source/inc/fmsearch.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsearch.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 165630eab8..f5e77b1238 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmservs.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 0e13eedb31..5d378212e9 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmshimp.hxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index ffbfc92c19..7baa4f451a 100644
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmslotinvalidator.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/source/inc/fmsrccfg.hxx
index f716fbf035..5c66e607bd 100644
--- a/svx/source/inc/fmsrccfg.hxx
+++ b/svx/source/inc/fmsrccfg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsrccfg.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index 50cac2fe22..6aee178a9d 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmsrcimp.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index 5d3ab50217..a62a9ac6a9 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtextcontroldialogs.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 3195987dd4..6b557d4b98 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtextcontrolfeature.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 88dd00f1a5..46081e5c3d 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtextcontrolshell.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmtools.hxx b/svx/source/inc/fmtools.hxx
index 3c71698f06..821031812a 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/source/inc/fmtools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmtools.hxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index fab29dbba6..55a47b6120 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmundo.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 9513fa1841..4bbfe25dfe 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmurl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 64a8ef4849..bac5a59df0 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fmvwimp.hxx,v $
- * $Revision: 1.34.260.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index c157a5db4e..e2b32acc0c 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -1,31 +1,28 @@
 
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: formcontrolfactory.hxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef SVX_FORMCONTROLMANAGER_HXX
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index eb99d80fd0..6b6c016ba8 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formcontrolling.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 2083e2baa8..96da1c9aa5 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formtoolbars.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc
index 01b0bf41c3..b0b7bc01fc 100644
--- a/svx/source/inc/frmsel.hrc
+++ b/svx/source/inc/frmsel.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmsel.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index fd14d1c7e4..0abf4c9104 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmselimpl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 2167079da1..3d77ef1f54 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridcell.hxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index 9b7930837e..8cb3aac649 100644
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridcols.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/hlmarkwn.hrc b/svx/source/inc/hlmarkwn.hrc
index 911d4bdd34..2f573b1e88 100644
--- a/svx/source/inc/hlmarkwn.hrc
+++ b/svx/source/inc/hlmarkwn.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmarkwn.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/hlmarkwn.hxx b/svx/source/inc/hlmarkwn.hxx
index 1f861c6781..ad8e7d8a7c 100644
--- a/svx/source/inc/hlmarkwn.hxx
+++ b/svx/source/inc/hlmarkwn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlmarkwn.hxx,v $
- * $Revision: 1.7.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/hyperdlg.hrc b/svx/source/inc/hyperdlg.hrc
index d6725cd74c..e05c6b8d14 100644
--- a/svx/source/inc/hyperdlg.hrc
+++ b/svx/source/inc/hyperdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hyperdlg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/linectrl.hrc b/svx/source/inc/linectrl.hrc
index 7604d12b9e..e43f37e80b 100644
--- a/svx/source/inc/linectrl.hrc
+++ b/svx/source/inc/linectrl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linectrl.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/macropg_impl.hxx b/svx/source/inc/macropg_impl.hxx
index 31cfed0726..61ad33d2c3 100644
--- a/svx/source/inc/macropg_impl.hxx
+++ b/svx/source/inc/macropg_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: macropg_impl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/optchart.hrc b/svx/source/inc/optchart.hrc
index d22735ea64..c1050b45b8 100644
--- a/svx/source/inc/optchart.hrc
+++ b/svx/source/inc/optchart.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optchart.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/optdict.hrc b/svx/source/inc/optdict.hrc
index d11ce46407..a96c2b3c08 100644
--- a/svx/source/inc/optdict.hrc
+++ b/svx/source/inc/optdict.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optdict.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx
index c72511cc89..f0af19699a 100644
--- a/svx/source/inc/recoveryui.hxx
+++ b/svx/source/inc/recoveryui.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recoveryui.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index 91a47051a7..9212093316 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdbdatacolumn.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index a17198bea1..a8ee726e2f 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sqlparserclient.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 8fb8ff9db2..2f7b600732 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stringlistresource.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 5f093b375e..4008bbd130 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoimp.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx
index c316341786..a05a4813a6 100644
--- a/svx/source/inc/svdoutlinercache.hxx
+++ b/svx/source/inc/svdoutlinercache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoutlinercache.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 169edd577f..05ce783f64 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxrectctaccessiblecontext.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index f4a4ecb0b0..7aa9ebba90 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabwin.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 269a97ea19..dfdb158744 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxform.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx
index 3e2b06246d..52853705ea 100644
--- a/svx/source/inc/trace.hxx
+++ b/svx/source/inc/trace.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: trace.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/treevisitor.hxx b/svx/source/inc/treevisitor.hxx
index f846f55d50..b089c52478 100644
--- a/svx/source/inc/treevisitor.hxx
+++ b/svx/source/inc/treevisitor.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef SVX_TREE_VISITOR_HXX
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index 605e76f208..63c9c9e8f7 100644
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: typeconversionclient.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/unoedprx.hxx b/svx/source/inc/unoedprx.hxx
index 8edb9c773d..441cbd1a9f 100644
--- a/svx/source/inc/unoedprx.hxx
+++ b/svx/source/inc/unoedprx.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoedprx.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index c4e3cf0287..530eda4b4c 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogalthemeprovider.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx
index e912d02ad4..feb501a52d 100644
--- a/svx/source/inc/unopolyhelper.hxx
+++ b/svx/source/inc/unopolyhelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopolyhelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/unopracc.hxx b/svx/source/inc/unopracc.hxx
index 2cde80e068..5deba6251b 100644
--- a/svx/source/inc/unopracc.hxx
+++ b/svx/source/inc/unopracc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopracc.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index ee2a017545..b28a3e8ca7 100644
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xfm_addcondition.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index e3db48eafe..6906abf523 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlxtexp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index 5d4082a84b..d6cff1420b 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlxtimp.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/intro_tmpl.hrc
index f724cd476e..e49b27cb29 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/intro_tmpl.hrc
@@ -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: intro_tmpl.hrc,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index 25cd0ce8b0..f8af8a4839 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iso.src,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
index be373893cf..db5acf407b 100644
--- a/svx/source/intro/makefile.mk
+++ b/svx/source/intro/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 6e770483b3..0ec06f3f16 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ooo.src,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index b2fae878a7..1c1749715b 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SmartTagItem.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 4ce57b6603..8570caaebb 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: algitem.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/boxobj.hxx b/svx/source/items/boxobj.hxx
index c9dd80a555..a833e61975 100644
--- a/svx/source/items/boxobj.hxx
+++ b/svx/source/items/boxobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: boxobj.hxx,v $
- * $Revision: 1.3.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/bulitem.cxx b/svx/source/items/bulitem.cxx
index 36ca6126a0..e3342fbf8e 100644
--- a/svx/source/items/bulitem.cxx
+++ b/svx/source/items/bulitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bulitem.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/charhiddenitem.cxx b/svx/source/items/charhiddenitem.cxx
index 0ae65385d2..fdc74fae7e 100644
--- a/svx/source/items/charhiddenitem.cxx
+++ b/svx/source/items/charhiddenitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: charhiddenitem.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 2e46e07cfb..1f2f061302 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chrtitem.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index f588a7035a..5ccb38b3fc 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: clipfmtitem.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index b3f86d8e20..556cc55a4c 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customshapeitem.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 20be51e821..9930649cc7 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: drawitem.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 229d38c11b..846c422ae0 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3ditem.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx
index 361b8d1750..35152e025f 100644
--- a/svx/source/items/flditem.cxx
+++ b/svx/source/items/flditem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: flditem.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 5b1bef3c9c..0240dfd7b5 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: frmitems.cxx,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index c8bf3195a0..fba82c7767 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grfitem.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 1af7e32f80..2ce3513997 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hlnkitem.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/itemtype.cxx b/svx/source/items/itemtype.cxx
index e94e5d9e2f..2b84d4bc39 100644
--- a/svx/source/items/itemtype.cxx
+++ b/svx/source/items/itemtype.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemtype.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index ef4bf0b001..e13d504c68 100644
--- a/svx/source/items/makefile.mk
+++ b/svx/source/items/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.19 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 96ce38d50b..5c1546bb8c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numfmtsh.cxx,v $
- * $Revision: 1.20.128.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 1121799631..493d348da6 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numinf.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx
index a77a49c5ed..cdbdf3754f 100644
--- a/svx/source/items/numitem.cxx
+++ b/svx/source/items/numitem.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: numitem.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 001d910bd8..6c13584bd7 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ofaitem.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index e01db0cffb..c5173cd969 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pageitem.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/paperinf.cxx b/svx/source/items/paperinf.cxx
index 7a67a0009f..bd79cd743b 100644
--- a/svx/source/items/paperinf.cxx
+++ b/svx/source/items/paperinf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paperinf.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index 56436448d7..2f17735207 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paraitem.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index c694ab4863..e97d436d7e 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postattr.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 6374cee936..ce19f1604a 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rotmodit.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx
index 641c5f1340..6d5d071848 100644
--- a/svx/source/items/svxempty.cxx
+++ b/svx/source/items/svxempty.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxempty.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index e7cd9c2da0..317514601a 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxerr.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
index 84ca05c9b6..e54bcc7133 100644
--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxerr.src,v $
- * $Revision: 1.55 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/svxfont.cxx b/svx/source/items/svxfont.cxx
index 98c911c8a8..d344a454f6 100644
--- a/svx/source/items/svxfont.cxx
+++ b/svx/source/items/svxfont.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxfont.cxx,v $
- * $Revision: 1.15.216.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index c7a35f625b..ca53c0f052 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxitems.src,v $
- * $Revision: 1.83.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index 8460558e67..c92c5becb7 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textitem.cxx,v $
- * $Revision: 1.74.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index e1e92d05ff..709efd4309 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewlayoutitem.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/writingmodeitem.cxx b/svx/source/items/writingmodeitem.cxx
index 35afd13291..51a3fd591a 100644
--- a/svx/source/items/writingmodeitem.cxx
+++ b/svx/source/items/writingmodeitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: writingmodeitem.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/xmlcnitm.cxx b/svx/source/items/xmlcnitm.cxx
index b7e6260951..ca416608d8 100644
--- a/svx/source/items/xmlcnitm.cxx
+++ b/svx/source/items/xmlcnitm.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: xmlcnitm.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/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index ab13d3c09f..cf44b6ee34 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomitem.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index a4ed25e942..64c97db23e 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomslideritem.cxx,v $
- * $Revision: 1.3.138.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index c3cd979955..d5c3b5e701 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SmartTagCtl.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index ddb8671064..f0b5528d5a 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: clipboardctl.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 0ab16726aa..39eb34ff98 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fntctl.cxx,v $
- * $Revision: 1.8.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 5b478be7b0..42e6b25875 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fntszctl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk
index 0a9668977c..ed1657d1ce 100644
--- a/svx/source/mnuctrls/makefile.mk
+++ b/svx/source/mnuctrls/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/mnuctrls/mnuctrls.src b/svx/source/mnuctrls/mnuctrls.src
index 163e6a1643..e973ea249f 100644
--- a/svx/source/mnuctrls/mnuctrls.src
+++ b/svx/source/mnuctrls/mnuctrls.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mnuctrls.src,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/countryid.cxx b/svx/source/msfilter/countryid.cxx
index a6fcd73d0a..01ff7e897d 100644
--- a/svx/source/msfilter/countryid.cxx
+++ b/svx/source/msfilter/countryid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: countryid.cxx,v $
- * $Revision: 1.8.242.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/escherex.cxx b/svx/source/msfilter/escherex.cxx
index d21aa84a2d..fc9e605854 100644
--- a/svx/source/msfilter/escherex.cxx
+++ b/svx/source/msfilter/escherex.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: escherex.cxx,v $
- * $Revision: 1.77.64.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/msfilter/eschesdo.cxx b/svx/source/msfilter/eschesdo.cxx
index 86a1bd131b..76785b53b3 100644
--- a/svx/source/msfilter/eschesdo.cxx
+++ b/svx/source/msfilter/eschesdo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eschesdo.cxx,v $
- * $Revision: 1.39 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/eschesdo.hxx b/svx/source/msfilter/eschesdo.hxx
index 9e74e1be4d..88f1396f4c 100644
--- a/svx/source/msfilter/eschesdo.hxx
+++ b/svx/source/msfilter/eschesdo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eschesdo.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/makefile.mk b/svx/source/msfilter/makefile.mk
index adbe8b1048..29a8a3dae1 100644
--- a/svx/source/msfilter/makefile.mk
+++ b/svx/source/msfilter/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/msfilter/mscodec.cxx b/svx/source/msfilter/mscodec.cxx
index 54da76c546..b3b2b85137 100644
--- a/svx/source/msfilter/mscodec.cxx
+++ b/svx/source/msfilter/mscodec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mscodec.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx
index 63ad774409..1275a70a86 100644
--- a/svx/source/msfilter/msdffimp.cxx
+++ b/svx/source/msfilter/msdffimp.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: msdffimp.cxx,v $
- * $Revision: 1.157 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/msfilter/msfiltertracer.cxx b/svx/source/msfilter/msfiltertracer.cxx
index a1505e0664..1cd686a105 100644
--- a/svx/source/msfilter/msfiltertracer.cxx
+++ b/svx/source/msfilter/msfiltertracer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msfiltertracer.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/msocximex.cxx b/svx/source/msfilter/msocximex.cxx
index 493e097857..979baa0a7c 100644
--- a/svx/source/msfilter/msocximex.cxx
+++ b/svx/source/msfilter/msocximex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msocximex.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/msoleexp.cxx b/svx/source/msfilter/msoleexp.cxx
index b01fe6b0f7..c5fa951f58 100644
--- a/svx/source/msfilter/msoleexp.cxx
+++ b/svx/source/msfilter/msoleexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msoleexp.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/msvbasic.cxx b/svx/source/msfilter/msvbasic.cxx
index b8df285fbe..a3026dcd02 100644
--- a/svx/source/msfilter/msvbasic.cxx
+++ b/svx/source/msfilter/msvbasic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msvbasic.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/msvbasic.hxx b/svx/source/msfilter/msvbasic.hxx
index 8492062433..68b74e25d3 100644
--- a/svx/source/msfilter/msvbasic.hxx
+++ b/svx/source/msfilter/msvbasic.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msvbasic.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/svxmsbas.cxx b/svx/source/msfilter/svxmsbas.cxx
index a2448c8727..e41e45d16a 100644
--- a/svx/source/msfilter/svxmsbas.cxx
+++ b/svx/source/msfilter/svxmsbas.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxmsbas.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/msfilter/svxmsbas2.cxx b/svx/source/msfilter/svxmsbas2.cxx
index afd772bbd7..4c3b5f35e0 100644
--- a/svx/source/msfilter/svxmsbas2.cxx
+++ b/svx/source/msfilter/svxmsbas2.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: svxmsbas.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/msfilter/viscache.hxx b/svx/source/msfilter/viscache.hxx
index b2dd0e44a2..797c308956 100644
--- a/svx/source/msfilter/viscache.hxx
+++ b/svx/source/msfilter/viscache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viscache.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/asiancfg.cxx b/svx/source/options/asiancfg.cxx
index cd1731d23d..be647e6343 100644
--- a/svx/source/options/asiancfg.cxx
+++ b/svx/source/options/asiancfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: asiancfg.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/htmlcfg.cxx b/svx/source/options/htmlcfg.cxx
index d88542e014..8bd282d73c 100644
--- a/svx/source/options/htmlcfg.cxx
+++ b/svx/source/options/htmlcfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: htmlcfg.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/makefile.mk b/svx/source/options/makefile.mk
index d68703983e..deb371a461 100644
--- a/svx/source/options/makefile.mk
+++ b/svx/source/options/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.31 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/options/multipat.src b/svx/source/options/multipat.src
index f38183ce2b..0be9985494 100644
--- a/svx/source/options/multipat.src
+++ b/svx/source/options/multipat.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: multipat.src,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optaccessibility.src b/svx/source/options/optaccessibility.src
index c2ac15db58..0649763042 100644
--- a/svx/source/options/optaccessibility.src
+++ b/svx/source/options/optaccessibility.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optaccessibility.src,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optasian.src b/svx/source/options/optasian.src
index 83da984639..344bfa3f44 100644
--- a/svx/source/options/optasian.src
+++ b/svx/source/options/optasian.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optasian.src,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optchart.src b/svx/source/options/optchart.src
index baaa6acde7..4a4f1d30ff 100644
--- a/svx/source/options/optchart.src
+++ b/svx/source/options/optchart.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optchart.src,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optcolor.src b/svx/source/options/optcolor.src
index dbf33e7522..81d04fc9ad 100644
--- a/svx/source/options/optcolor.src
+++ b/svx/source/options/optcolor.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optcolor.src,v $
- * $Revision: 1.47.196.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optctl.src b/svx/source/options/optctl.src
index 7841b17b16..7c79e9884f 100644
--- a/svx/source/options/optctl.src
+++ b/svx/source/options/optctl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optctl.src,v $
- * $Revision: 1.20.254.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optdict.src b/svx/source/options/optdict.src
index 0e52166591..5b140c46ef 100644
--- a/svx/source/options/optdict.src
+++ b/svx/source/options/optdict.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optdict.src,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optgenrl.src b/svx/source/options/optgenrl.src
index 68e9e8ced7..e726a7bddd 100644
--- a/svx/source/options/optgenrl.src
+++ b/svx/source/options/optgenrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgenrl.src,v $
- * $Revision: 1.57 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optgrid.cxx b/svx/source/options/optgrid.cxx
index 69fd27a3b5..ec4dbcc4f2 100644
--- a/svx/source/options/optgrid.cxx
+++ b/svx/source/options/optgrid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgrid.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optgrid.hrc b/svx/source/options/optgrid.hrc
index 766851f251..ced9bee740 100644
--- a/svx/source/options/optgrid.hrc
+++ b/svx/source/options/optgrid.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgrid.hrc,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optgrid.src b/svx/source/options/optgrid.src
index 84644d92bc..8db8d0b546 100644
--- a/svx/source/options/optgrid.src
+++ b/svx/source/options/optgrid.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optgrid.src,v $
- * $Revision: 1.59 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optimprove.src b/svx/source/options/optimprove.src
index 86fc6d1c1a..2ca35e086a 100644
--- a/svx/source/options/optimprove.src
+++ b/svx/source/options/optimprove.src
@@ -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: optimprove.src,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/svx/source/options/optinet2.src b/svx/source/options/optinet2.src
index d2b9ecb1bb..d744550da5 100644
--- a/svx/source/options/optinet2.src
+++ b/svx/source/options/optinet2.src
@@ -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: optinet2.src,v $
- * $Revision: 1.97 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/options/optitems.cxx b/svx/source/options/optitems.cxx
index f37e9ecc98..8701c20a70 100644
--- a/svx/source/options/optitems.cxx
+++ b/svx/source/options/optitems.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optitems.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optjsearch.src b/svx/source/options/optjsearch.src
index 8c5c6259f6..e6aab84b9c 100644
--- a/svx/source/options/optjsearch.src
+++ b/svx/source/options/optjsearch.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optjsearch.src,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx
index 41eebdbbbb..02f86e08a8 100644
--- a/svx/source/options/optlingu.cxx
+++ b/svx/source/options/optlingu.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: optlingu.cxx,v $
- * $Revision: 1.68 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/options/optlingu.hrc b/svx/source/options/optlingu.hrc
index e1dcacbcff..15d320dedf 100644
--- a/svx/source/options/optlingu.hrc
+++ b/svx/source/options/optlingu.hrc
@@ -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: optlingu.hrc,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/svx/source/options/optlingu.src b/svx/source/options/optlingu.src
index a550451193..b4c61a6852 100644
--- a/svx/source/options/optlingu.src
+++ b/svx/source/options/optlingu.src
@@ -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: optlingu.src,v $
- * $Revision: 1.51 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/options/optpath.src b/svx/source/options/optpath.src
index 82f8aade66..27c9c68716 100644
--- a/svx/source/options/optpath.src
+++ b/svx/source/options/optpath.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optpath.src,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optsave.src b/svx/source/options/optsave.src
index ee3d21c435..d191082aa9 100644
--- a/svx/source/options/optsave.src
+++ b/svx/source/options/optsave.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optsave.src,v $
- * $Revision: 1.82 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/optspell.src b/svx/source/options/optspell.src
index 511e3befea..e4241d4e4b 100644
--- a/svx/source/options/optspell.src
+++ b/svx/source/options/optspell.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: optspell.src,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/options/srchcfg.cxx b/svx/source/options/srchcfg.cxx
index 60ef1a1143..f89c907739 100644
--- a/svx/source/options/srchcfg.cxx
+++ b/svx/source/options/srchcfg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srchcfg.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/makefile.mk b/svx/source/outliner/makefile.mk
index deef353049..7fe4866901 100644
--- a/svx/source/outliner/makefile.mk
+++ b/svx/source/outliner/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/outliner/outl_pch.cxx b/svx/source/outliner/outl_pch.cxx
index 803d3d31d8..f8864d1810 100644
--- a/svx/source/outliner/outl_pch.cxx
+++ b/svx/source/outliner/outl_pch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outl_pch.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outl_pch.hxx b/svx/source/outliner/outl_pch.hxx
index cf72c9cc5d..3679688130 100644
--- a/svx/source/outliner/outl_pch.hxx
+++ b/svx/source/outliner/outl_pch.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outl_pch.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx
index 43fea6e316..aab655d9f4 100644
--- a/svx/source/outliner/outleeng.cxx
+++ b/svx/source/outliner/outleeng.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: outleeng.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/outliner/outleeng.hxx b/svx/source/outliner/outleeng.hxx
index cf4d7d13a9..5c97b4821e 100644
--- a/svx/source/outliner/outleeng.hxx
+++ b/svx/source/outliner/outleeng.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: outleeng.hxx,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/svx/source/outliner/outlin2.cxx b/svx/source/outliner/outlin2.cxx
index 9f41159053..377001736d 100644
--- a/svx/source/outliner/outlin2.cxx
+++ b/svx/source/outliner/outlin2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outlin2.cxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx
index 193a5f26eb..2feb9d7559 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/svx/source/outliner/outliner.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: outliner.cxx,v $
- * $Revision: 1.75.20.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/outliner/outliner.hrc b/svx/source/outliner/outliner.hrc
index 036a7d24e1..e707ab397a 100644
--- a/svx/source/outliner/outliner.hrc
+++ b/svx/source/outliner/outliner.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outliner.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outliner.src b/svx/source/outliner/outliner.src
index 1cfea02c3d..9454341543 100644
--- a/svx/source/outliner/outliner.src
+++ b/svx/source/outliner/outliner.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outliner.src,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outlobj.cxx b/svx/source/outliner/outlobj.cxx
index 72601d9d7e..c09f759d09 100644
--- a/svx/source/outliner/outlobj.cxx
+++ b/svx/source/outliner/outlobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outlobj.cxx,v $
- * $Revision: 1.12.78.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outlundo.cxx b/svx/source/outliner/outlundo.cxx
index 5c3612af4f..482beeb69a 100644
--- a/svx/source/outliner/outlundo.cxx
+++ b/svx/source/outliner/outlundo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outlundo.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outlundo.hxx b/svx/source/outliner/outlundo.hxx
index 7ed0e83a71..e323942ccc 100644
--- a/svx/source/outliner/outlundo.hxx
+++ b/svx/source/outliner/outlundo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: outlundo.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx
index 2fdc0074c4..5b412be9fa 100644
--- a/svx/source/outliner/outlvw.cxx
+++ b/svx/source/outliner/outlvw.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: outlvw.cxx,v $
- * $Revision: 1.34.150.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/outliner/paralist.cxx b/svx/source/outliner/paralist.cxx
index e5493a24dc..f8239ca8ff 100644
--- a/svx/source/outliner/paralist.cxx
+++ b/svx/source/outliner/paralist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paralist.cxx,v $
- * $Revision: 1.11.6.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/outliner/paralist.hxx b/svx/source/outliner/paralist.hxx
index c2205530a9..d855acc8ca 100644
--- a/svx/source/outliner/paralist.hxx
+++ b/svx/source/outliner/paralist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: paralist.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 9ca93a6854..6adc261821 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animationstate.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/animation/makefile.mk b/svx/source/sdr/animation/makefile.mk
index 85c9beef4b..c1c67df193 100644
--- a/svx/source/sdr/animation/makefile.mk
+++ b/svx/source/sdr/animation/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx
index 79334d29a3..f70e1eaa33 100644
--- a/svx/source/sdr/animation/objectanimator.cxx
+++ b/svx/source/sdr/animation/objectanimator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectanimator.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 26416d5ff3..490b4d5ebc 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: scheduler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk
index 44e161a3b5..b5b1773d82 100644
--- a/svx/source/sdr/attribute/makefile.mk
+++ b/svx/source/sdr/attribute/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/attribute/sdrallattribute.cxx b/svx/source/sdr/attribute/sdrallattribute.cxx
index 1150f5a684..0558b6e7d1 100644
--- a/svx/source/sdr/attribute/sdrallattribute.cxx
+++ b/svx/source/sdr/attribute/sdrallattribute.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrallattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 8bd8c3b6b6..faf3979110 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
index 0a96ad2f6f..f3b15a06e9 100644
--- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 244946e393..e68498b89a 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextattribute.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx
index a0cb38b5ed..a2acf66f80 100644
--- a/svx/source/sdr/contact/displayinfo.cxx
+++ b/svx/source/sdr/contact/displayinfo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: displayinfo.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk
index fcc79db635..7989b53611 100644
--- a/svx/source/sdr/contact/makefile.mk
+++ b/svx/source/sdr/contact/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 435c08fba5..b933105cbb 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectcontact.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 4b0ffda2d6..7926cc651d 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectcontactofobjlistpainter.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 898e76a0cc..21f31e11de 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: objectcontactofpageview.cxx,v $
- * $Revision: 1.20.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/objectcontacttools.cxx b/svx/source/sdr/contact/objectcontacttools.cxx
index 42f186fbc2..fd95300338 100644
--- a/svx/source/sdr/contact/objectcontacttools.cxx
+++ b/svx/source/sdr/contact/objectcontacttools.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: objectcontacttools.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index ff3320f74e..4376476491 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrmediawindow.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index 9bd510b7af..3e05ce6fde 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrmediawindow.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index f3c6ea732a..dce39fea6f 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontact.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index 948bab1b2f..dc7d25bc19 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index 8bde7b3c45..a41133222a 100644
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dcube.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index 954b54396a..a747024572 100644
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dextrude.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index 5ef516f9a0..65296beefd 100644
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dlathe.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index e61c73c2d8..d4aab9727a 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dpolygon.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -75,8 +71,8 @@ namespace sdr
             basegfx::B3DPolyPolygon aPolyPolygon3D(GetE3dPolygonObj().GetPolyPolygon3D());
             const basegfx::B3DPolyPolygon aPolyNormals3D(GetE3dPolygonObj().GetPolyNormals3D());
             const basegfx::B2DPolyPolygon aPolyTexture2D(GetE3dPolygonObj().GetPolyTexture2D());
-            const bool bNormals(aPolyNormals3D.count() && aPolyNormals3D.count() == aPolyPolygon3D.count());

-            const bool bTexture(aPolyTexture2D.count() && aPolyTexture2D.count() == aPolyPolygon3D.count());

+            const bool bNormals(aPolyNormals3D.count() && aPolyNormals3D.count() == aPolyPolygon3D.count());
+            const bool bTexture(aPolyTexture2D.count() && aPolyTexture2D.count() == aPolyPolygon3D.count());
 
             if(bNormals || bTexture)
             {
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index cf5768910f..8f10ac917a 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofe3dscene.cxx,v $
- * $Revision: 1.10.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index 8dad4c0d93..bf6ab03dca 100644
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofe3dsphere.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 80e6129618..be28682f42 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofgraphic.cxx,v $
- * $Revision: 1.14.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx
index 5c5e6edc48..d9807db743 100644
--- a/svx/source/sdr/contact/viewcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewcontactofgroup.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofgroup.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index 0b7d9d7572..a0f1f1f6ec 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofmasterpagedescriptor.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx
index 58bd3a8b96..5c5919d614 100644
--- a/svx/source/sdr/contact/viewcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofpageobj.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 115493a205..2a6e519240 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrcaptionobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index 789381c3a3..9f2b447d13 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrcircobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
index 54da961623..a74ec37b0d 100644
--- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdredgeobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index cf5dfd3d72..75436b5b51 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrmeasureobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index b9cf4e0a9b..d0a7c741ee 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrmediaobj.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index c96ca346dd..54fce37264 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrobj.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 28ab8cbff6..465ebd24fe 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrobjcustomshape.cxx,v $
- * $Revision: 1.7.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 3facc1c031..fcb2899288 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrole2obj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index c150681efb..65af6459f8 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofsdrpage.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 1cb99de835..6854881063 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrpathobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index f9113d7b64..dd84297da0 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewcontactofsdrrectobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx
index f61e858061..722b0893d0 100644
--- a/svx/source/sdr/contact/viewcontactoftextobj.cxx
+++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactoftextobj.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 1de8ffd792..4262f0fe19 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofunocontrol.cxx,v $
- * $Revision: 1.12.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
index ce6a755af7..648f914fa6 100644
--- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactofvirtobj.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 2a600fd5d5..2f0366bb3a 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontact.cxx,v $
- * $Revision: 1.17.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
index c59072c31d..52d544b1ac 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofe3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
index 21f7a9d3e2..027f648532 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofe3dscene.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 276da4a240..49294a1b63 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofgraphic.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 9f58fe5f9e..40012c9f91 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofgroup.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index 567708e5da..668252fd61 100644
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofmasterpagedescriptor.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 87ba0b8c3a..c0163e12d5 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofpageobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index e9d5188b9f..dbb642c8e4 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontactofsdrmediaobj.cxx,v $
- * $Revision: 1.16.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 21b544a91d..b9c7416bee 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofsdrobj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 9c9aaa959c..803fecd2d2 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofsdrole2obj.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,8 +38,8 @@
 #include <drawinglayer/attribute/fillattribute.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <com/sun/star/embed/EmbedMisc.hpp>

-#include <com/sun/star/embed/EmbedStates.hpp>

+#include <com/sun/star/embed/EmbedMisc.hpp>
+#include <com/sun/star/embed/EmbedStates.hpp>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 02e9800bd8..6cd0516bf4 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: viewobjectcontactofsdrpage.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 3ca670eb59..729e5702e4 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontactofunocontrol.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
index 83bf85afd7..3558e51b09 100644
--- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewobjectcontactredirector.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 374e48ec97..ab100d966e 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventhandler.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/event/makefile.mk b/svx/source/sdr/event/makefile.mk
index 48ab1c2a52..89ae1abf11 100644
--- a/svx/source/sdr/event/makefile.mk
+++ b/svx/source/sdr/event/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk
index d202992c09..c31de6903b 100644
--- a/svx/source/sdr/overlay/makefile.mk
+++ b/svx/source/sdr/overlay/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index 7ea78b6d4c..b76a46edde 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayanimatedbitmapex.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index bf3a020398..aa403d080f 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaybitmapex.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx
index 9204c0e87b..5b1fa0aaa8 100644
--- a/svx/source/sdr/overlay/overlaycrosshair.cxx
+++ b/svx/source/sdr/overlay/overlaycrosshair.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaycrosshair.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayhatchrect.cxx b/svx/source/sdr/overlay/overlayhatchrect.cxx
index 284aa204af..0a03ee17ba 100644
--- a/svx/source/sdr/overlay/overlayhatchrect.cxx
+++ b/svx/source/sdr/overlay/overlayhatchrect.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaybitmap.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx
index eaff70a6f0..7560c6684c 100644
--- a/svx/source/sdr/overlay/overlayhelpline.cxx
+++ b/svx/source/sdr/overlay/overlayhelpline.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayhelpline.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index 5a2a5f2248..537837f86f 100644
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayline.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 64ac530e55..80ffb3e355 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaymanager.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index c016d8e557..375af80d05 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaymanagerbuffered.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 83947826ff..6ed0c0befa 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobject.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx
index cda1bbd636..eb110cf904 100644
--- a/svx/source/sdr/overlay/overlayobjectcell.cxx
+++ b/svx/source/sdr/overlay/overlayobjectcell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobjectcell.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 1ca102e36e..310df25b72 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobjectlist.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index 6827cd64cf..75f8c2d885 100644
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaypolypolygon.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index d89a457a87..8d64056f27 100644
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaysdrobject.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index e2e079a37f..25cbbee0bd 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayrollingrectangle.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index b60f1e66ce..02627e9955 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayline.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index ea20bd4f20..a2b9c2f4fc 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlayobject.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index f22c737166..f749ac19d5 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: overlaytriangle.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk
index 7510b6a23b..5af191d3f7 100644
--- a/svx/source/sdr/primitive2d/makefile.mk
+++ b/svx/source/sdr/primitive2d/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 379195a8c9..0bff689357 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: primitivefactory2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index b6a8a4e1f7..fab1ea2837 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrattributecreator.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 233aed8ed2..52544ff1bf 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrcaptionprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index a00820289c..53d0a9a00f 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrconnectorprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 93e8b3a6e7..00d1865cd1 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrcustomshapeprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 6204eba4fa..f751977cd0 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrdecompositiontools.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index dee271c97f..db6dbce6c9 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrellipseprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index d57540cce7..5296639c08 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrgrafprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index ce9f40037c..768e34d3f8 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrmeasureprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 1f4d48ea0a..6cb11d0e24 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrole2primitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 164e122e67..eee98b9b60 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrcaptionprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 128a450ee2..a3eecda11e 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrpathprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 0ae9483787..1261b9298a 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: primitivefactory2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 6449859318..a809ccbf74 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrrectangleprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index bd8547c8b8..c41cbaa32d 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrtextprimitive2d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -121,13 +117,13 @@ namespace drawinglayer
             mbContainsOtherFields(false)
         {
             const EditTextObject& rETO = maOutlinerParaObject.GetTextObject();
-            

-            mbContainsPageField = rETO.HasField(SvxPageField::StaticType());

-            mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticType());

-            mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticType())

-                || rETO.HasField(SvxFooterField::StaticType())

-                || rETO.HasField(SvxDateTimeField::StaticType())

-                || rETO.HasField(SvxAuthorField::StaticType());

+            
+            mbContainsPageField = rETO.HasField(SvxPageField::StaticType());
+            mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticType());
+            mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticType())
+                || rETO.HasField(SvxFooterField::StaticType())
+                || rETO.HasField(SvxDateTimeField::StaticType())
+                || rETO.HasField(SvxAuthorField::StaticType());
         }
 
         bool SdrTextPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/source/sdr/primitive3d/makefile.mk
index 3cc084def4..cd4af97b25 100644
--- a/svx/source/sdr/primitive3d/makefile.mk
+++ b/svx/source/sdr/primitive3d/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index 9538cba1b5..3921110e50 100644
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: sdrattributecreator3d.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index c7b82b7c11..e30b2c2e0b 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attributeproperties.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 535d48d283..98ac1d8293 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: captionproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index f47c2e9793..819b2962e0 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: circleproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index 576d9ffed5..d4b2190086 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: connectorproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 53bef66057..2c122f1a41 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: customshapeproperties.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index de3021062b..76634024a6 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: defaultproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index 5726758b72..d8c504cef6 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dcompoundproperties.cxx,v $
- * $Revision: 1.9.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx
index 830a97c4e3..bea715ea6f 100644
--- a/svx/source/sdr/properties/e3dextrudeproperties.cxx
+++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dextrudeproperties.cxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx
index 4f3a8d7a5d..4e35d9c62d 100644
--- a/svx/source/sdr/properties/e3dlatheproperties.cxx
+++ b/svx/source/sdr/properties/e3dlatheproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dlatheproperties.cxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index e0590d5987..826d763e70 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dproperties.cxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 28ebae1b9a..596bb2e7b6 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dsceneproperties.cxx,v $
- * $Revision: 1.11.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx
index c2c74b8d16..0cb235e98d 100644
--- a/svx/source/sdr/properties/e3dsphereproperties.cxx
+++ b/svx/source/sdr/properties/e3dsphereproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: e3dsphereproperties.cxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index f0d1af1590..57c0300c44 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: emptyproperties.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 69921e4227..0f3aa1f0cc 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: graphicproperties.cxx,v $
- * $Revision: 1.12.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index f04140dfac..23fdc2b228 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: groupproperties.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 45df3911ed..c7f7f6e338 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: itemsettools.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk
index 04e96dd6c2..f1f52e44b9 100644
--- a/svx/source/sdr/properties/makefile.mk
+++ b/svx/source/sdr/properties/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 7bd657ddc5..32407e7310 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: measureproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index baace122db..9fd319551f 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pageproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index fe317a495a..326c58c41d 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: properties.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index bf8d25bbd9..85b5485fcd 100644
--- a/svx/source/sdr/properties/rectangleproperties.cxx
+++ b/svx/source/sdr/properties/rectangleproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rectangleproperties.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 229ba89db5..dd41e1b1ee 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: textproperties.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 43b3dd207e..7dd8565476 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SmartTagMgr.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/smarttags/makefile.mk b/svx/source/smarttags/makefile.mk
index 9b07d977dd..5f805a684b 100644
--- a/svx/source/smarttags/makefile.mk
+++ b/svx/source/smarttags/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index de03c1459e..499f1adcdb 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 7001281945..e5af3bd34f 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: app.src,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/src/hidgen.hrc b/svx/source/src/hidgen.hrc
index dd924cbd13..bc3ade7ff5 100644
--- a/svx/source/src/hidgen.hrc
+++ b/svx/source/src/hidgen.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidgen.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
index b1ce276958..046355769f 100644
--- a/svx/source/src/makefile.mk
+++ b/svx/source/src/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 545ce1d83c..d7012ab9cc 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: insctrl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk
index 7a6fad6e2a..6648398d8a 100644
--- a/svx/source/stbctrls/makefile.mk
+++ b/svx/source/stbctrls/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 843c845426..862d412f81 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: modctrl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index a5376ab390..a9ea5f85de 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pszctrl.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index c2f34c9c20..b1c183ab86 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selctrl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 59eea7747f..12965e0c87 100644
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stbctrls.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 70ac1d96b8..df3b2acc92 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stbctrls.src,v $
- * $Revision: 1.35 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 554366c9f1..d85dea4d70 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlsecctrl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 4c4f4d3b52..afb816c1c3 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomctrl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index a452521ed2..c5b9895158 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: zoomsliderctrl.cxx,v $
- * $Revision: 1.3.138.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index 0e92b9dd0f..acd60e2768 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ActionDescriptionProvider.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index f7eac6db04..9dc14238b1 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: clonelist.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx
index 75da911e8c..9a0d1665e6 100644
--- a/svx/source/svdraw/gradtrns.cxx
+++ b/svx/source/svdraw/gradtrns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gradtrns.cxx,v $
- * $Revision: 1.7.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx
index d8078f8766..2c0155032f 100644
--- a/svx/source/svdraw/gradtrns.hxx
+++ b/svx/source/svdraw/gradtrns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gradtrns.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
index d0aeb60b77..89890a3911 100644
--- a/svx/source/svdraw/impgrfll.cxx
+++ b/svx/source/svdraw/impgrfll.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impgrfll.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
index e777ad70d3..cde63eaccb 100644
--- a/svx/source/svdraw/makefile.mk
+++ b/svx/source/svdraw/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.27 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index 74053345ff..c6148299aa 100644
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: polypolygoneditor.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx
index 009f0fe683..283cf033f5 100644
--- a/svx/source/svdraw/sdrcomment.cxx
+++ b/svx/source/svdraw/sdrcomment.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrcomment.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx
index 008ae7734e..3d8e426b5b 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdetc.cxx,v $
- * $Revision: 1.35.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index befbc27f98..88aaa6ec2d 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrmasterpagedescriptor.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index d1e2f13403..1a81d7b7b0 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrpagewindow.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 276a7d4f8d..12dc5f1803 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdrpaintwindow.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx
index fc3e991f65..7e44fff10b 100644
--- a/svx/source/svdraw/selectioncontroller.cxx
+++ b/svx/source/svdraw/selectioncontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: selectioncontroller.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 867c0956ca..ceb779f56b 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdattr.cxx,v $
- * $Revision: 1.34.212.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdcrtmt.hxx b/svx/source/svdraw/svdcrtmt.hxx
index a8668cda22..0cf7642bf1 100644
--- a/svx/source/svdraw/svdcrtmt.hxx
+++ b/svx/source/svdraw/svdcrtmt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdcrtmt.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index ca93a202fe..41d9d6be13 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdcrtv.cxx,v $
- * $Revision: 1.29.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index f29a610b39..74d8fd10a4 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrag.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index d8085dc9df..6b1aa78bc8 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrgm1.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 47f7324b8a..054b24d82b 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrgmt.cxx,v $
- * $Revision: 1.21.6.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 7c653e828e..5529916e1e 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svddrgv.cxx,v $
- * $Revision: 1.27.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index ec5d5ba7ab..a27bcc1d07 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdedtv.cxx,v $
- * $Revision: 1.24.148.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 76c3c3f3ab..dd8c007577 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdedtv1.cxx,v $
- * $Revision: 1.30.146.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 89122decf4..923b139c1d 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdedtv2.cxx,v $
- * $Revision: 1.33.146.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index adca082371..59a3e40a52 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdedxv.cxx,v $
- * $Revision: 1.62 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index b01caa73f8..7adbb5e3f4 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdetc.cxx,v $
- * $Revision: 1.35.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 52bfccdc0c..82613d8762 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdfmtf.cxx,v $
- * $Revision: 1.20.84.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index bb35c7e03c..96458f1515 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdfmtf.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
index 3229c6d463..f587245069 100644
--- a/svx/source/svdraw/svdfppt.cxx
+++ b/svx/source/svdraw/svdfppt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdfppt.cxx,v $
- * $Revision: 1.163.6.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 8d879ca4e1..76f327670a 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdglev.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index f195f582e0..ad8ade90f0 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdglue.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 7c415cefb0..38c3b66bac 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdhdl.cxx,v $
- * $Revision: 1.34.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 731285801b..2813b6f032 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdhlpln.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index c8e2066bf5..4a5a1e445a 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdibrow.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index d396876bfd..90dc5dd063 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svditer.cxx,v $
- * $Revision: 1.9.246.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svditext.hxx b/svx/source/svdraw/svditext.hxx
index c817269bcc..0d0faf9bec 100644
--- a/svx/source/svdraw/svditext.hxx
+++ b/svx/source/svdraw/svditext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svditext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 7895583833..835ba014fb 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdlayer.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 21eef709ef..4dd202d8d9 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmark.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 991582d84b..84edc0cad0 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmodel.cxx,v $
- * $Revision: 1.82 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d8a14f17c3..0e0badb554 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmrkv.cxx,v $
- * $Revision: 1.39.74.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -209,9 +206,9 @@ void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
             bMarkedPointsRectsDirty=TRUE;
         }
 /* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects		
-        if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )

-        {

-            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );

+        if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
+        {
+            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );
         }		
 */
     }
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index f039060b08..e915dd8aa5 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdmrkv1.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 44a29c619b..9be605e212 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoashp.cxx,v $
- * $Revision: 1.51.52.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -1673,11 +1670,11 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     }
 }
 
-void SdrObjCustomShape::SetModel(SdrModel* pNewModel)

-{

-    SdrTextObj::SetModel(pNewModel);

-    mXRenderedCustomShape.clear();

-}

+void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
+{
+    SdrTextObj::SetModel(pNewModel);
+    mXRenderedCustomShape.clear();
+}
 
 UINT16 SdrObjCustomShape::GetObjIdentifier() const
 {
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 828cd948ff..05977a608c 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoattr.cxx,v $
- * $Revision: 1.53.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index ae5686b2c6..0bde010254 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.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: svdobj.cxx,v $
- * $Revision: 1.99.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 8630d2c1d1..8d20b3cdb9 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdocapt.cxx,v $
- * $Revision: 1.30.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 363fa04a3c..60665f1a95 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdocirc.cxx,v $
- * $Revision: 1.37.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 1c89bbbd70..0cc7eeb99f 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoedge.cxx,v $
- * $Revision: 1.45.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 28ccf8ec96..b5a93e21ce 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdograf.cxx,v $
- * $Revision: 1.84.18.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index d1966d1bfc..b6df469f83 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdogrp.cxx,v $
- * $Revision: 1.38.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdoimp.cxx b/svx/source/svdraw/svdoimp.cxx
index ad29fb3907..7b7fa26520 100644
--- a/svx/source/svdraw/svdoimp.cxx
+++ b/svx/source/svdraw/svdoimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoimp.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 975d5dea92..e64e3932c1 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdomeas.cxx,v $
- * $Revision: 1.35.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index ee8352b6ce..7a5cbc7feb 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdomedia.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 1e89aab1b0..8fa6de9c75 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.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: svdoole2.cxx,v $
- * $Revision: 1.89.60.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 8b6d05ca9e..5933edbd1a 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdopage.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 5558f69a01..eb813539f5 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdopath.cxx,v $
- * $Revision: 1.51.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index f6c0fbc6ea..a4365875d2 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdorect.cxx,v $
- * $Revision: 1.31.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a0116cd1d9..0ed2b74254 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.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: svdotext.cxx,v $
- * $Revision: 1.90.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 8cc1ede0ec..d0738f9c79 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -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: svdotextdecomposition.cxx,v $
- *
- * $Revision: 1.2.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -119,10 +115,10 @@ namespace
         // the visible area for contour text decomposition
         basegfx::B2DVector                                          maScale;
 
-        // #SJ# ClipRange for BlockText decomposition; only text portions completely

-        // inside are to be accepted, so this is different from geometric clipping

-        // (which would allow e.g. upper parts of portions to remain). Only used for 

-        // BlockText (see there)

+        // #SJ# ClipRange for BlockText decomposition; only text portions completely
+        // inside are to be accepted, so this is different from geometric clipping
+        // (which would allow e.g. upper parts of portions to remain). Only used for 
+        // BlockText (see there)
         basegfx::B2DRange                                           maClipRange;
 
         DECL_LINK(decomposeContourTextPrimitive, DrawPortionInfo* );
@@ -144,12 +140,12 @@ namespace
     public:
         impTextBreakupHandler(SdrOutliner& rOutliner)
         :	maTextPortionPrimitives(),
-            maLinePrimitives(),

-            maParagraphPrimitives(),

-            mrOutliner(rOutliner),

-            maNewTransformA(),

-            maNewTransformB(),

-            maScale(),

+            maLinePrimitives(),
+            maParagraphPrimitives(),
+            mrOutliner(rOutliner),
+            maNewTransformA(),
+            maNewTransformB(),
+            maScale(),
             maClipRange()
         {
         }
@@ -607,43 +603,43 @@ namespace
     {
         if(pInfo)
         {
-            // #SJ# Is clipping wanted? This is text clipping; only accept a portion

-            // if it's completely in the range

-            if(!maClipRange.isEmpty())

-            {

-                // Test start position first; this allows to not get the text range at

-                // all if text is far outside

-                const basegfx::B2DPoint aStartPosition(pInfo->mrStartPos.X(), pInfo->mrStartPos.Y());

-

-                if(!maClipRange.isInside(aStartPosition))

-                {

-                    return 0;

-                }

-

-                // Start position is inside. Get TextBoundRect and TopLeft next

-                drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice;

-                aTextLayouterDevice.setFont(pInfo->mrFont);

-

-                const basegfx::B2DRange aTextBoundRect(

-                    aTextLayouterDevice.getTextBoundRect(

-                        pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen));

-                const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition);

-

-                if(!maClipRange.isInside(aTopLeft))

-                {

-                    return 0;

-                }

-

-                // TopLeft is inside. Get BottomRight and check

-                const basegfx::B2DPoint aBottomRight(aTextBoundRect.getMaximum() + aStartPosition);

-

-                if(!maClipRange.isInside(aBottomRight))

-                {

-                    return 0;

-                }

-

-                // all inside, clip was successful

-            }

+            // #SJ# Is clipping wanted? This is text clipping; only accept a portion
+            // if it's completely in the range
+            if(!maClipRange.isEmpty())
+            {
+                // Test start position first; this allows to not get the text range at
+                // all if text is far outside
+                const basegfx::B2DPoint aStartPosition(pInfo->mrStartPos.X(), pInfo->mrStartPos.Y());
+
+                if(!maClipRange.isInside(aStartPosition))
+                {
+                    return 0;
+                }
+
+                // Start position is inside. Get TextBoundRect and TopLeft next
+                drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice;
+                aTextLayouterDevice.setFont(pInfo->mrFont);
+
+                const basegfx::B2DRange aTextBoundRect(
+                    aTextLayouterDevice.getTextBoundRect(
+                        pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen));
+                const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition);
+
+                if(!maClipRange.isInside(aTopLeft))
+                {
+                    return 0;
+                }
+
+                // TopLeft is inside. Get BottomRight and check
+                const basegfx::B2DPoint aBottomRight(aTextBoundRect.getMaximum() + aStartPosition);
+
+                if(!maClipRange.isInside(aBottomRight))
+                {
+                    return 0;
+                }
+
+                // all inside, clip was successful
+            }
             impHandleDrawPortionInfo(*pInfo);
         }
 
@@ -960,13 +956,13 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
     aNewTransformB.rotate(fRotate);
     aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
 
-    // #SJ# create ClipRange (if needed)

-    basegfx::B2DRange aClipRange;

-

-    if(rSdrBlockTextPrimitive.getClipOnBounds())

-    {

-        aClipRange.expand(-aAdjOffset);

-        aClipRange.expand(basegfx::B2DTuple(aAnchorTextSize.Width(), aAnchorTextSize.Height()) - aAdjOffset);

+    // #SJ# create ClipRange (if needed)
+    basegfx::B2DRange aClipRange;
+
+    if(rSdrBlockTextPrimitive.getClipOnBounds())
+    {
+        aClipRange.expand(-aAdjOffset);
+        aClipRange.expand(basegfx::B2DTuple(aAnchorTextSize.Width(), aAnchorTextSize.Height()) - aAdjOffset);
     }
 
     // now break up text primitives.
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 077ddce02e..e931777cda 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svdotextpathdecomposition.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index ff7d82c523..f70f7eaa04 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotxat.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 14e0ad1d84..90633b4e66 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotxdr.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 07258ef669..aca8afb6c2 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotxed.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index 566bd6fdd2..a716c04550 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotxfl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 4a6484c230..fe6e7239a1 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotxln.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 9d4917efbc..06392269e8 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotxtr.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 313de1087f..7d8a69c648 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdouno.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 0df23e7bb0..b2a3cd5107 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoutl.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index b8f73bea43..b5b231950b 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdoutlinercache.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 63ff2ef669..a8048737ec 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdovirt.cxx,v $
- * $Revision: 1.21.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index dfbba7b02a..987fa9710c 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpage.cxx,v $
- * $Revision: 1.67 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 7a8847dc0d..d9b6daad0e 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpagv.cxx,v $
- * $Revision: 1.62 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index cbf7e4f8d2..60bc1a00c7 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpntv.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 9f6fd4da5c..836f1efef1 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdpoev.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdscrol.cxx b/svx/source/svdraw/svdscrol.cxx
index a20150e224..ce1d4e32bf 100644
--- a/svx/source/svdraw/svdscrol.cxx
+++ b/svx/source/svdraw/svdscrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdscrol.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdscrol.hxx b/svx/source/svdraw/svdscrol.hxx
index b641737ebc..f44cf3d81c 100644
--- a/svx/source/svdraw/svdscrol.hxx
+++ b/svx/source/svdraw/svdscrol.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdscrol.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 4f051f8ecb..c85191f8bb 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdsnpv.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 595ff95bcd..6218f2e4dc 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -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: svdstr.src,v $
- * $Revision: 1.95.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 93c0024ecc..80365289db 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdtext.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 3d8285b895..8133f42387 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdtrans.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 896e4d4aee..36c1928906 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.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: svdundo.cxx,v $
- * $Revision: 1.31.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 4b2b463acf..8388ee961d 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdview.cxx,v $
- * $Revision: 1.29.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index b86fba9d0c..fd1e2549eb 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdviter.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 4d717d4dfa..5314483172 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdxcgv.cxx,v $
- * $Revision: 1.34.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svrtf/makefile.mk b/svx/source/svrtf/makefile.mk
index 950036034d..c75565e406 100644
--- a/svx/source/svrtf/makefile.mk
+++ b/svx/source/svrtf/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index c387fdf7e9..12306ffb20 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rtfgrf.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx
index 471b00d497..479c2f03a7 100644
--- a/svx/source/svrtf/rtfitem.cxx
+++ b/svx/source/svrtf/rtfitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: rtfitem.cxx,v $
- * $Revision: 1.35.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svrtf/segincr.asm b/svx/source/svrtf/segincr.asm
index d90d79dbd8..c93831af22 100644
--- a/svx/source/svrtf/segincr.asm
+++ b/svx/source/svrtf/segincr.asm
@@ -1,14 +1,10 @@
 ;*************************************************************************
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
-; Copyright 2008 by Sun Microsystems, Inc.
 ;
-; OpenOffice.org - a multi-platform office productivity suite
-;
-; $RCSfile: segincr.asm,v $
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
-; $Revision: 1.6 $
+; OpenOffice.org - a multi-platform office productivity suite
 ;
 ; This file is part of OpenOffice.org.
 ;
diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx
index 8808a1dfd9..5cf2805f5e 100644
--- a/svx/source/svrtf/svxrtf.cxx
+++ b/svx/source/svrtf/svxrtf.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: svxrtf.cxx,v $
- * $Revision: 1.34.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svxlink/fileobj.cxx b/svx/source/svxlink/fileobj.cxx
index a77c8852bb..9bf3a8168e 100644
--- a/svx/source/svxlink/fileobj.cxx
+++ b/svx/source/svxlink/fileobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fileobj.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svxlink/fileobj.hxx b/svx/source/svxlink/fileobj.hxx
index 9acbcfb0a1..0bf1ef052f 100644
--- a/svx/source/svxlink/fileobj.hxx
+++ b/svx/source/svxlink/fileobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fileobj.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx
index 5d96e0cfc4..3986acf112 100644
--- a/svx/source/svxlink/linkmgr.cxx
+++ b/svx/source/svxlink/linkmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkmgr.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svxlink/linkmgr.src b/svx/source/svxlink/linkmgr.src
index aca244e55c..98388c077c 100644
--- a/svx/source/svxlink/linkmgr.src
+++ b/svx/source/svxlink/linkmgr.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linkmgr.src,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/svxlink/makefile.mk b/svx/source/svxlink/makefile.mk
index 4494b1dcce..7841204b33 100644
--- a/svx/source/svxlink/makefile.mk
+++ b/svx/source/svxlink/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 6066023eac..f97be12ea6 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessiblecell.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 6114b540bb..68eeb1a0b4 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessiblecell.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 0c6beba822..303c25777f 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: accessibletableshape.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 0f399fa73d..7ce2dd8c7c 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cell.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index dd79dd1f5f..20862fbcec 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cell.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 7ed2328745..224d252328 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cellcursor.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index 87cef8c343..39b5a08241 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cellcursor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 3be461adce..ffb9f05343 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: celleditsource.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx
index ebd991905b..9408070794 100644
--- a/svx/source/table/celleditsource.hxx
+++ b/svx/source/table/celleditsource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: celleditsource.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx
index 9aebf641bd..29fc043090 100644
--- a/svx/source/table/cellrange.cxx
+++ b/svx/source/table/cellrange.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cellrange.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index 5b2f67cf78..8932bc735f 100644
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cellrange.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx
index f0f8f1ae6c..78ef7b6179 100644
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/table/celltypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: celltypes.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk
index ae0dc5eb68..14243f231d 100644
--- a/svx/source/table/makefile.mk
+++ b/svx/source/table/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx
index a94b04fd2f..f5297afc77 100644
--- a/svx/source/table/propertyset.cxx
+++ b/svx/source/table/propertyset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyset.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 9002e05d02..2413952728 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyset.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 947ecc25a7..7a15147e03 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svdotable.cxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/table.src b/svx/source/table/table.src
index a4f16e048b..9ef9285995 100644
--- a/svx/source/table/table.src
+++ b/svx/source/table/table.src
@@ -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: table.src,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/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 024f858303..bb3ed55c73 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablecolumn.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index ccac757eca..8cdf836281 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablecolumn.hxx,v $
- * $Revision: 1.3.264.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index 76e5000d6a..7d0e89a252 100644
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablecolumns.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index dec7835cbb..d774348228 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablecolumns.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 4d6eb39511..e5d17a16b2 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablecontroller.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index b4eecf0902..5e369d9046 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablecontroller.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 214ca0bad8..d5507ad12e 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.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: tabledesign.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/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 511616921c..39792b537f 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablehandles.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index e1a9095118..0704e94a84 100644
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablehandles.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index b27529a323..bf18eaa422 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablelayouter.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index f1bb421cbe..7236e0059f 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablelayouter.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 901f7775e1..e40b06f8ad 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablemodel.cxx,v $
- * $Revision: 1.4.264.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 58d2d17820..0156c53d9c 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablemodel.hxx,v $
- * $Revision: 1.3.264.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index df71084374..d73fc5a3a8 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablerow.cxx,v $
- * $Revision: 1.3.148.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 537ccd1b4e..13f5b370ac 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablerow.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index 1fb302eb71..2b995dfa89 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablerows.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index 16da90247e..8770bd26bf 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablerows.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 53c557d972..0753c0ef2b 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablertfexporter.cxx,v $
- * $Revision: 1.3.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 399c6d2015..fcf6fbef30 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tablertfimporter.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index f4d6e89aec..ac8f03b4ed 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tableundo.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 36e71a254f..8e206a9ba8 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tableundo.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 03ffdc3acf..6dc73c61e7 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactoftableobj.cxx,v $
- * $Revision: 1.4.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index 883be542cc..733f28be0d 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontactoftableobj.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index c7df83a525..1a3763acb6 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: colrctrl.cxx,v $
- * $Revision: 1.20.76.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
index 1d897c8d99..023c271c54 100644
--- a/svx/source/tbxctrls/colrctrl.src
+++ b/svx/source/tbxctrls/colrctrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: colrctrl.src,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 01f68240f9..4bd3ff2088 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrusioncontrols.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
index c31fa9df27..87169ba50f 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrusioncontrols.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 3e391def8e..96c44395bc 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrusioncontrols.src,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 0c2163e9ee..b3f6971ea3 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fillctrl.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 7cb779974b..5d4cc29c12 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkgallery.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index 880bb5dd54..e2e6e470fb 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkgallery.src,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 0afb9e8571..d46d45cc16 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formatpaintbrushctrl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 87e65ec556..4c59de1210 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grafctrl.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/grafctrl.hrc b/svx/source/tbxctrls/grafctrl.hrc
index 5db2e4e194..29f94fdeec 100644
--- a/svx/source/tbxctrls/grafctrl.hrc
+++ b/svx/source/tbxctrls/grafctrl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grafctrl.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
index fca94d2cb5..82f29a2fa6 100644
--- a/svx/source/tbxctrls/grafctrl.src
+++ b/svx/source/tbxctrls/grafctrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: grafctrl.src,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index d8921d4fe5..7f231e55fa 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.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: itemwin.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 18101465bc..27b8bfd981 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.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: layctrl.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 864fcd6d22..24caa3cce9 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lboxctrl.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/lboxctrl.hrc b/svx/source/tbxctrls/lboxctrl.hrc
index 6168eb0fb3..37ab6f23fd 100644
--- a/svx/source/tbxctrls/lboxctrl.hrc
+++ b/svx/source/tbxctrls/lboxctrl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lboxctrl.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
index 42eb9ef493..18e3456755 100644
--- a/svx/source/tbxctrls/lboxctrl.src
+++ b/svx/source/tbxctrls/lboxctrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lboxctrl.src,v $
- * $Revision: 1.30 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index dca3dd00e7..2a69a5ff89 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.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: linectrl.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/linectrl.src b/svx/source/tbxctrls/linectrl.src
index b0339dbf48..0265875adb 100644
--- a/svx/source/tbxctrls/linectrl.src
+++ b/svx/source/tbxctrls/linectrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: linectrl.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
index 9bca3b9798..1a6aa2b7a7 100644
--- a/svx/source/tbxctrls/makefile.mk
+++ b/svx/source/tbxctrls/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index 2cc1f4a43e..8b1dfe10de 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: subtoolboxcontrol.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 94494aa3aa..e39ff96d88 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbcontrl.cxx,v $
- * $Revision: 1.84 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index daf2626750..0fc0868119 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbcontrl.src,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index d00ea44738..4261ba292f 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbunocontroller.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index fa56bc2111..0ae839cc86 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxalign.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index fd4c11e639..072d56e0f7 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxcolor.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index d19acf5a9f..690251ab4c 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxcolorupdate.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbxdraw.hrc b/svx/source/tbxctrls/tbxdraw.hrc
index 72c8e47025..6281674a1c 100644
--- a/svx/source/tbxctrls/tbxdraw.hrc
+++ b/svx/source/tbxctrls/tbxdraw.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxdraw.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src
index d035158530..0641ff39e1 100644
--- a/svx/source/tbxctrls/tbxdraw.src
+++ b/svx/source/tbxctrls/tbxdraw.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxdraw.src,v $
- * $Revision: 1.46 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 1c9ccdfd55..1317a6f185 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tbxdrctl.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/toolbarmenu.cxx b/svx/source/tbxctrls/toolbarmenu.cxx
index 895afe7b5c..d969132942 100644
--- a/svx/source/tbxctrls/toolbarmenu.cxx
+++ b/svx/source/tbxctrls/toolbarmenu.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: toolbarmenu.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 287ed3513d..6350da268f 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: verttexttbxctrl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 2112510162..a4bc1f1664 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: extrusionbar.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 11130e35c6..f28bae9ca3 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkbar.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src
index 6324d3b90a..79279b3432 100644
--- a/svx/source/toolbars/fontworkbar.src
+++ b/svx/source/toolbars/fontworkbar.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fontworkbar.src,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk
index ad4184ca67..1f9c4151ed 100644
--- a/svx/source/toolbars/makefile.mk
+++ b/svx/source/toolbars/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/inc/buttongroup.hrc
index 5255186991..b99403b57e 100644
--- a/svx/source/unodialogs/inc/buttongroup.hrc
+++ b/svx/source/unodialogs/inc/buttongroup.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: buttongroup.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 783272ebd8..0a39426780 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_dictionarydialog.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
index 7ebd1a2c23..5c4c8e2bf0 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_dictionarydialog.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index ce8d42893c..a699278985 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_dictionarydialog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
index 458e7af3f6..30bacf43a6 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_dictionarydialog.src,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
index 3d03100a37..4545ef26fc 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_direction_ids.hrc,v $
- * $Revision: 1.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
index a03204825a..e2b67ab7df 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_direction_tmpl.hrc,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 68a6623598..a6858c355e 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_translation_unodialog.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 612043d151..7beb773170 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_translation_unodialog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 85cb9a9676..b330305028 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_translationdialog.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
index 3882012839..5e593ef467 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_translationdialog.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index b262c2705e..299a0fe6e6 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_translationdialog.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
index dcc74b99e7..d30b61558f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chinese_translationdialog.src,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk
index 26d975e00c..3eee50ec43 100644
--- a/svx/source/unodialogs/textconversiondlgs/makefile.mk
+++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx
index 93e4e0ca1e..d4779aad15 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resid.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index 99d63d1b98..ed474b59c3 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resid.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc
index e55187b00d..0c2e396529 100644
--- a/svx/source/unodialogs/textconversiondlgs/resids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/resids.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resids.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 77449201bf..e397ba9e58 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: services.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index f360ef2281..e70de61dce 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoGraphicExporter.cxx,v $
- * $Revision: 1.44 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index 5a755af937..ebf0ac7a7a 100644
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoGraphicExporter.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index ef1848cf3e..292ec4637b 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoNameItemTable.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 5d4effba94..e0ea38419e 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoNameItemTable.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 0296bc060f..d7dfe88a97 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.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: UnoNamespaceMap.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/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 9324ed5a0b..5b1ede4264 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XPropertyTable.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index ca41fa9fe5..763ef53aa1 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gluepts.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk
index 4b8ecb093d..afe886cac4 100644
--- a/svx/source/unodraw/makefile.mk
+++ b/svx/source/unodraw/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 98137146fc..7bde42a8bb 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: recoveryui.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index c64b1d1e71..d59d13e947 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeimpl.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 337f7ebfb2..408587d318 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index f8b5bceec9..2dc9602f03 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tableshape.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 61854aa9cf..3fbb954cb1 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unobtabl.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 671d28e431..6d5ab9144c 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoctabl.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unodraw.src b/svx/source/unodraw/unodraw.src
index 3e5d556dd8..1e8fcf12d9 100644
--- a/svx/source/unodraw/unodraw.src
+++ b/svx/source/unodraw/unodraw.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unodraw.src,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index b23dc0e6b3..0ab5c537ff 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unodtabl.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unofdesc.cxx b/svx/source/unodraw/unofdesc.cxx
index 879b13ad5e..b88cd5db3c 100644
--- a/svx/source/unodraw/unofdesc.cxx
+++ b/svx/source/unodraw/unofdesc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofdesc.cxx,v $
- * $Revision: 1.7.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 9e17cc99e3..f3a46b6d8e 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogtabl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 329905c31d..05a16be785 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unohtabl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx
index 25a72b0f8b..8486a92c07 100644
--- a/svx/source/unodraw/unoipset.cxx
+++ b/svx/source/unodraw/unoipset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoipset.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index 3958ec5537..7d18424702 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomlstr.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index b514debc7b..1ba94f4537 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomod.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 1e7645df15..a2363e45bc 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unomtabl.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx
index 638c27fe68..a311725bfa 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/svx/source/unodraw/unonrule.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unonrule.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 5bfeb3a3bf..399012cb4c 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopage.cxx,v $
- * $Revision: 1.50.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 78a0f885f9..54f78901e3 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopool.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 0ab785b391..8daf660123 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoprov.cxx,v $
- * $Revision: 1.72.92.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1d3b94ebe9..5713366132 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshap2.cxx,v $
- * $Revision: 1.70 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index cb59ca37e4..83108cd56b 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshap3.cxx,v $
- * $Revision: 1.32.226.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96c2caec15..d1662cf600 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshap4.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8e4cd15b1c..b936ac2c13 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshape.cxx,v $
- * $Revision: 1.178.104.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 0cc232efdc..962d5f56b6 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.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: unoshcol.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/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 5d4969020b..50be3afa04 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoshtxt.cxx,v $
- * $Revision: 1.62 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 172f8a5f69..e5e303f87c 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unottabl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/UnoForbiddenCharsTable.cxx b/svx/source/unoedit/UnoForbiddenCharsTable.cxx
index 53b36fd977..c29a08d88d 100644
--- a/svx/source/unoedit/UnoForbiddenCharsTable.cxx
+++ b/svx/source/unoedit/UnoForbiddenCharsTable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UnoForbiddenCharsTable.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/makefile.mk b/svx/source/unoedit/makefile.mk
index 802ded5aa7..1d6e55ec13 100644
--- a/svx/source/unoedit/makefile.mk
+++ b/svx/source/unoedit/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/unoedit/unoedhlp.cxx b/svx/source/unoedit/unoedhlp.cxx
index 7de489be70..d2d1085adf 100644
--- a/svx/source/unoedit/unoedhlp.cxx
+++ b/svx/source/unoedit/unoedhlp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoedhlp.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unoedprx.cxx b/svx/source/unoedit/unoedprx.cxx
index 2b500aeac6..3b90ed4ce0 100644
--- a/svx/source/unoedit/unoedprx.cxx
+++ b/svx/source/unoedit/unoedprx.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoedprx.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unoedsrc.cxx b/svx/source/unoedit/unoedsrc.cxx
index ffeba43289..8fcd316cc1 100644
--- a/svx/source/unoedit/unoedsrc.cxx
+++ b/svx/source/unoedit/unoedsrc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoedsrc.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unofield.cxx b/svx/source/unoedit/unofield.cxx
index f058a44ba8..ff5a4596c9 100644
--- a/svx/source/unoedit/unofield.cxx
+++ b/svx/source/unoedit/unofield.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofield.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unofored.cxx b/svx/source/unoedit/unofored.cxx
index 20807d46ff..08f1b85505 100644
--- a/svx/source/unoedit/unofored.cxx
+++ b/svx/source/unoedit/unofored.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unofored.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unoforou.cxx b/svx/source/unoedit/unoforou.cxx
index 96eef1c0b0..daa53099f0 100644
--- a/svx/source/unoedit/unoforou.cxx
+++ b/svx/source/unoedit/unoforou.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: unoforou.cxx,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unoedit/unopracc.cxx b/svx/source/unoedit/unopracc.cxx
index 16656bba36..5eddf8e251 100644
--- a/svx/source/unoedit/unopracc.cxx
+++ b/svx/source/unoedit/unopracc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unopracc.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx
index 0706db84a9..181b402606 100644
--- a/svx/source/unoedit/unotext.cxx
+++ b/svx/source/unoedit/unotext.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: unotext.cxx,v $
- * $Revision: 1.66 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unoedit/unotext2.cxx b/svx/source/unoedit/unotext2.cxx
index 186f980c7c..f33acd0396 100644
--- a/svx/source/unoedit/unotext2.cxx
+++ b/svx/source/unoedit/unotext2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unotext2.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unoviwed.cxx b/svx/source/unoedit/unoviwed.cxx
index 19ef737c0b..c5132584bb 100644
--- a/svx/source/unoedit/unoviwed.cxx
+++ b/svx/source/unoedit/unoviwed.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoviwed.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unoedit/unoviwou.cxx b/svx/source/unoedit/unoviwou.cxx
index 9825d6db53..4a22f84f70 100644
--- a/svx/source/unoedit/unoviwou.cxx
+++ b/svx/source/unoedit/unoviwou.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoviwou.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk
index a699208f4f..cb982d8a75 100755..100644
--- a/svx/source/unogallery/makefile.mk
+++ b/svx/source/unogallery/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 77ad6522bf..7bc8361b8c 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogalitem.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index 6773591d50..a574e649d2 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogalitem.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index ef7646c944..10e1f02b2e 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogaltheme.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index 8a0f6f95dd..3e13f9fc36 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogaltheme.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index f96d569b75..5e82f11410 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unogalthemeprovider.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xml/editsource.hxx b/svx/source/xml/editsource.hxx
index 8cca5d8108..c64103b2fa 100644
--- a/svx/source/xml/editsource.hxx
+++ b/svx/source/xml/editsource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: editsource.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk
index f8d77f9fea..931cdd801d 100644
--- a/svx/source/xml/makefile.mk
+++ b/svx/source/xml/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 8b94cf3085..0c2e76fc44 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.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: xmleohlp.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 0caab98da9..9985436d60 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlexport.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 1ba98b3e79..f5665af57a 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.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: xmlgrhlp.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xml/xmltxtexp.cxx b/svx/source/xml/xmltxtexp.cxx
index 63a681ed41..8e404da623 100644
--- a/svx/source/xml/xmltxtexp.cxx
+++ b/svx/source/xml/xmltxtexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltxtexp.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xml/xmltxtimp.cxx b/svx/source/xml/xmltxtimp.cxx
index 092540886a..722ebd6ec1 100644
--- a/svx/source/xml/xmltxtimp.cxx
+++ b/svx/source/xml/xmltxtimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltxtimp.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 4106cc00a7..68a8f9da91 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlxtexp.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index fb10ef3e8e..086f4882fb 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlxtimp.cxx,v $
- * $Revision: 1.17.264.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 2b9002aa46..6e22e89f71 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _xoutbmp.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index ab9f69d8c8..ffc825340e 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _xpoly.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk
index 70e2725e93..d80154a06e 100644
--- a/svx/source/xoutdev/makefile.mk
+++ b/svx/source/xoutdev/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 1e527885b7..1e98fdf68d 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xattr.cxx,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index b9f42039c4..ac128ac4b8 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xattr2.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index f34e9859aa..07dcd0a60e 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xattrbmp.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 40e7804adc..beaeb03a32 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xexch.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index fe81d0f8bd..8571016d67 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xpool.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 57e56fdec0..f9235934d4 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtabbtmp.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 06543d2e82..bbd75d441c 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtabcolr.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index e2a3ad1902..eafde4061e 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtabdash.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 4f43f10ce2..a6c413d548 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtabgrdt.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 90eba033e8..710185403e 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtabhtch.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 882a4a0a98..c8d4058803 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtable.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index f83e6c35f3..80b19a2fa3 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xtablend.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
index d22d6eb103..adf82213a4 100644
--- a/svx/uiconfig/layout/makefile.mk
+++ b/svx/uiconfig/layout/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/util/hidother.hrc b/svx/util/hidother.hrc
index 4a99c24246..68bb57a274 100644
--- a/svx/util/hidother.hrc
+++ b/svx/util/hidother.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hidother.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 5bce7c359e..7c60a51e2a 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -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: hidother.src,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 3dcf5ca250..490036ce89 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/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.61 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/util/makefile.pmk b/svx/util/makefile.pmk
index b2aae33291..baf3a0dc27 100644
--- a/svx/util/makefile.pmk
+++ b/svx/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx
index 455b857488..f10b698b14 100644
--- a/svx/util/svxpch.cxx
+++ b/svx/util/svxpch.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: svxpch.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 13cd4ea698..6d86394ad7 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: edittest.cxx,v $
- * $Revision: 1.20.212.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk
index a18c81ab5c..288d505f95 100644
--- a/svx/workben/makefile.mk
+++ b/svx/workben/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk
index 5b7c2a3d63..4b2e5573b6 100644
--- a/svx/workben/msview/makefile.mk
+++ b/svx/workben/msview/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 7e6cf43cff..d3692037a8 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: msview.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index 79473333d0..ce9d7210d2 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlconfig.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/desktop/cleanversion/makefile.mk b/sysui/desktop/cleanversion/makefile.mk
index 2d775799bf..1191bcc80f 100644
--- a/sysui/desktop/cleanversion/makefile.mk
+++ b/sysui/desktop/cleanversion/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 1e0761198c..934dbcd1fb 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.26 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk
index 545d46b08a..5c1008e6e4 100644
--- a/sysui/desktop/freedesktop/makefile.mk
+++ b/sysui/desktop/freedesktop/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index 370a343dab..c0668665e1 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/macosx/gen_strings.pl b/sysui/desktop/macosx/gen_strings.pl
index ed85d3e746..54eca8ddfa 100644
--- a/sysui/desktop/macosx/gen_strings.pl
+++ b/sysui/desktop/macosx/gen_strings.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: gen_strings.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/macosx/list_icons.pl b/sysui/desktop/macosx/list_icons.pl
index fc498c272d..baf155c03d 100644
--- a/sysui/desktop/macosx/list_icons.pl
+++ b/sysui/desktop/macosx/list_icons.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: list_icons.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 951def80bd..e407eda3e0 100644
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 77bfb31029..e3c79df709 100644
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.17 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/os2/makefile.mk b/sysui/desktop/os2/makefile.mk
index d848d46868..e9307eda77 100644
--- a/sysui/desktop/os2/makefile.mk
+++ b/sysui/desktop/os2/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 7d2467d32e..80092aa10f 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: productversion.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.28 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index 6baa04867e..c1d08bc3b2 100644
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.28 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 5451f7057f..65440d217d 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: brand.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index a0ed77b179..dc1e1d49ba 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.29 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 8ae555792b..af1f52142d 100644
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: translate.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index ae08a37728..66e752654c 100644
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright
index 2ebebd6ed8..bc2059a3ef 100644
--- a/sysui/desktop/solaris/copyright
+++ b/sysui/desktop/solaris/copyright
@@ -1,2 +1,2 @@
-Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+Copyright 2000, 2010 Oracle and/or its affiliates.  All rights reserved.
 Use is subject to license terms.
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index 32dc11be96..a5753a39d2 100644
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.23 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index 5be2ca62d0..1a61e1a224 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.29 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
index 269ff27b4e..9818f2a819 100644
--- a/sysui/desktop/tg_rpm.mk
+++ b/sysui/desktop/tg_rpm.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: tg_rpm.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
index 42386dbc53..33bbde5858 100644
--- a/sysui/desktop/util/makefile.mk
+++ b/sysui/desktop/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.21 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/source/win32/QuickStart/makefile.mk b/sysui/source/win32/QuickStart/makefile.mk
index 3073ec852d..3d1fed0e44 100644
--- a/sysui/source/win32/QuickStart/makefile.mk
+++ b/sysui/source/win32/QuickStart/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/source/win32/QuickStart/so/makefile.mk b/sysui/source/win32/QuickStart/so/makefile.mk
index cd0b4fb872..120d3da2c5 100644
--- a/sysui/source/win32/QuickStart/so/makefile.mk
+++ b/sysui/source/win32/QuickStart/so/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/source/win32/misc/AutoBuffer.cxx b/sysui/source/win32/misc/AutoBuffer.cxx
index 9f74567bc8..6c336d1cf0 100644
--- a/sysui/source/win32/misc/AutoBuffer.cxx
+++ b/sysui/source/win32/misc/AutoBuffer.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoBuffer.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/source/win32/misc/AutoBuffer.hxx b/sysui/source/win32/misc/AutoBuffer.hxx
index 68343b8b09..e3cee41df9 100644
--- a/sysui/source/win32/misc/AutoBuffer.hxx
+++ b/sysui/source/win32/misc/AutoBuffer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AutoBuffer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx
index f64e24fa56..676761e075 100644
--- a/sysui/source/win32/misc/WinImplHelper.cxx
+++ b/sysui/source/win32/misc/WinImplHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinImplHelper.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/source/win32/misc/WinImplHelper.hxx b/sysui/source/win32/misc/WinImplHelper.hxx
index c9aa069f38..176434a19a 100644
--- a/sysui/source/win32/misc/WinImplHelper.hxx
+++ b/sysui/source/win32/misc/WinImplHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WinImplHelper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/source/win32/misc/makefile.mk b/sysui/source/win32/misc/makefile.mk
index 99bffb582a..3a7d17720f 100644
--- a/sysui/source/win32/misc/makefile.mk
+++ b/sysui/source/win32/misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/source/win32/misc/resourceprovider.cxx b/sysui/source/win32/misc/resourceprovider.cxx
index b5b80391a9..2a3d4da0a4 100644
--- a/sysui/source/win32/misc/resourceprovider.cxx
+++ b/sysui/source/win32/misc/resourceprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/source/win32/misc/resourceprovider.hxx b/sysui/source/win32/misc/resourceprovider.hxx
index 3b257f1715..e1a0fbea30 100644
--- a/sysui/source/win32/misc/resourceprovider.hxx
+++ b/sysui/source/win32/misc/resourceprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resourceprovider.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl
index 3ecea2cb68..559dcc45f6 100644
--- a/sysui/util/checksize.pl
+++ b/sysui/util/checksize.pl
@@ -4,14 +4,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: checksize.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/sysui/util/makefile.mk b/sysui/util/makefile.mk
index d692c1da53..8cd439284f 100644
--- a/sysui/util/makefile.mk
+++ b/sysui/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk
index c98dc5fe07..d5e861f3c8 100644
--- a/ucb/inc/makefile.mk
+++ b/ucb/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/inc/pch/precompiled_ucb.cxx b/ucb/inc/pch/precompiled_ucb.cxx
index 1875ac1071..31acd44cd3 100644
--- a/ucb/inc/pch/precompiled_ucb.cxx
+++ b/ucb/inc/pch/precompiled_ucb.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_ucb.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 95c67e8284..e272c541e4 100644
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_ucb.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java
index 202bc35dcd..03e54fe710 100755..100644
--- a/ucb/qa/complex/tdoc/CheckContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckContentProvider.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckContentProvider.java,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
index 42e6e222c5..77cfa23c3f 100755..100644
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckTransientDocumentsContent.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index acf8be4c60..92b4d14b26 100755..100644
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckTransientDocumentsContentProvider.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
index 8c27a50d6e..d171e4616f 100755..100644
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CheckTransientDocumentsDocumentContent.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/interfaces/_XChild.java
index 755014ec39..ca198ffeda 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XChild.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XChild.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XChild.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java
index 46f5a5c238..c8e3452164 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XCommandInfoChangeNotifier.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java b/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java
index 3593e165e8..c9884b6b0e 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XCommandProcessor.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XComponent.java b/ucb/qa/complex/tdoc/interfaces/_XComponent.java
index 2a3c861d7b..185366dd5e 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XComponent.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XComponent.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XComponent.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XContent.java b/ucb/qa/complex/tdoc/interfaces/_XContent.java
index a79ed73285..40bd0ba21a 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XContent.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XContent.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XContent.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java
index a87882c4b1..24726e9a2b 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XPropertiesChangeNotifier.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java b/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java
index d972439ba4..2798519305 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XPropertyContainer.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java
index 4895ff350a..43359a41ff 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XPropertySetInfoChangeNotifier.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
index 48a5649f22..761cca8799 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XServiceInfo.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
index 929663acd9..e657530ee2 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: _XTypeProvider.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk
index 4656c805fd..6bafecca34 100755..100644
--- a/ucb/qa/complex/tdoc/interfaces/makefile.mk
+++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.32.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk
index 50aada12e7..e652c10076 100755..100644
--- a/ucb/qa/complex/tdoc/makefile.mk
+++ b/ucb/qa/complex/tdoc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7.32.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java
index 82d62b3a56..8d18b64b16 100755..100644
--- a/ucb/qa/complex/ucb/UCB.java
+++ b/ucb/qa/complex/ucb/UCB.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UCB.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk
index 147b1b3064..ea50de865f 100755..100644
--- a/ucb/qa/complex/ucb/makefile.mk
+++ b/ucb/qa/complex/ucb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4.32.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/qa/unoapi/makefile.mk b/ucb/qa/unoapi/makefile.mk
index 556e93f97d..fb569678bb 100644
--- a/ucb/qa/unoapi/makefile.mk
+++ b/ucb/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a6c3f0aa8e..804970ac9c 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachedcontentresultset.cxx,v $
- * $Revision: 1.14.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 693c66320f..1ead41c752 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachedcontentresultset.hxx,v $
- * $Revision: 1.5.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 4581351420..29865888e9 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachedcontentresultsetstub.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 230d60571e..54f6c24d6b 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachedcontentresultsetstub.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 7415ceb6c3..ad7bf9f968 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheddynamicresultset.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 3a99962e91..7811c83843 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheddynamicresultset.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index f335210860..09c5f029d4 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheddynamicresultsetstub.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 4c2e3f554f..0b475a8652 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheddynamicresultsetstub.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 8daa84f0f1..3aa0f1de53 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cacheserv.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 7f1254393e..9c3ccd6577 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contentresultsetwrapper.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 02966e2b54..7fbaed1feb 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contentresultsetwrapper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 7ff6e85f47..54f2b71d4e 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dynamicresultsetwrapper.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 97eac446f3..125ac80da1 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dynamicresultsetwrapper.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
index 09717b3f0f..ed949bd559 100644
--- a/ucb/source/cacher/makefile.mk
+++ b/ucb/source/cacher/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index 3410f69f97..ece9211c1a 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: identify.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index 08e1b8aa10..d8ea23b1ee 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: identify.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index e70b5ca879..996b2e38ba 100644
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.22 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 5da2142d75..a7fec30a42 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: providermap.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index b3fc75376c..484a5a8393 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provprox.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 97d0fc7ea8..cd441b0d97 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provprox.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index d1d93596ab..dab0a92443 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucb.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 8febff42ab..e032d92abe 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucb.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 0db14ca73f..ebb5367802 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbcmds.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx
index 623603ab5a..25b23f47ab 100644
--- a/ucb/source/core/ucbcmds.hxx
+++ b/ucb/source/core/ucbcmds.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbcmds.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index ade855e628..76023825a0 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbprops.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 6ff4ea0ecd..875a5ad923 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbprops.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 747571d042..84047e589c 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbserv.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index e0abbba396..762e28c12b 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbstore.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 3d9d0978d9..84088fe070 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbstore.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx
index c1f985d149..ddfed29941 100644
--- a/ucb/source/inc/regexp.hxx
+++ b/ucb/source/inc/regexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: regexp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index ed76c55929..3bff4e6190 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: regexpmap.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 084867e07f..094106a9fe 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: regexpmap.tpt,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/regexp/makefile.mk b/ucb/source/regexp/makefile.mk
index 8d0b938402..55c41e34b7 100644
--- a/ucb/source/regexp/makefile.mk
+++ b/ucb/source/regexp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 0e38b25e3a..f784532d31 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: regexp.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk
index bcd3b64447..1fae0337e8 100644
--- a/ucb/source/sorter/makefile.mk
+++ b/ucb/source/sorter/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.14 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index ca498689bd..0497dacde0 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sortdynres.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 6f46e545b5..2cffcb93bc 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sortdynres.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index 883b4544bf..d96b4bcff7 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sortmain.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 9fc3ffe764..6e546950a2 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sortresult.cxx,v $
- * $Revision: 1.18.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 0d25283b74..92c83e9037 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sortresult.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk
index 6b4ffc8581..3b02cb8a7d 100644
--- a/ucb/source/ucp/expand/makefile.mk
+++ b/ucb/source/ucp/expand/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 611531ff36..9cca0aa0bc 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucpexpand.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index ab279417b8..17e86a33e5 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bc.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 8a99cba1d0..c54009f261 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bc.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index c84cc69439..776482957c 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filcmd.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index 32fbc74d01..8b54a3820c 100644
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filcmd.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filerror.hxx b/ucb/source/ucp/file/filerror.hxx
index 3214ffd69b..ee7c73036a 100644
--- a/ucb/source/ucp/file/filerror.hxx
+++ b/ucb/source/ucp/file/filerror.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filerror.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 26392425cf..fa23949150 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filglob.cxx,v $
- * $Revision: 1.26.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx
index d9ee20f32a..558683ad2e 100644
--- a/ucb/source/ucp/file/filglob.hxx
+++ b/ucb/source/ucp/file/filglob.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filglob.hxx,v $
- * $Revision: 1.11.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 6def154d33..8ccd8980fb 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filid.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index fecf17b8c8..aabd47532d 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filid.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index a2bf11edeb..ac5e5e30c8 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filinl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index a8cd3d8544..c55725b465 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filinpstr.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 4271e651d9..16081ac276 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filinpstr.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index ad1a152cee..3bb2419b34 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filinsreq.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index b90f3053c2..38934ce6b7 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filinsreq.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index 4039e442b7..4f7e894352 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filnot.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 3f2bc53386..c3b5eca629 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filnot.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 3e24118a50..86c494cbd7 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filprp.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index 46acc7ee6e..d5e487c57e 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filprp.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx
index 1580069175..db1a66f429 100644
--- a/ucb/source/ucp/file/filrec.cxx
+++ b/ucb/source/ucp/file/filrec.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filrec.cxx,v $
- * $Revision: 1.3.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 40d98aa437..a6fb0c4b18 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filrec.hxx,v $
- * $Revision: 1.3.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index e4ccde0731..7e368d92a2 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filrow.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 296de98b6c..c418e88a8d 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filrow.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 134db87e19..0b11e333b2 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filrset.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 8815bc93e6..977eddec8c 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filrset.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index d353f029b3..93de258d0d 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filstr.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 815bb52a10..15a5199ba4 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filstr.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index d706bf9ad0..d79aafa172 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtask.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index bcb57587a3..9fa0339755 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: filtask.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index d03983bca0..e28f5659dd 100644
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.19 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 17137c8028..3826aa6012 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prov.cxx,v $
- * $Revision: 1.47 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 05956fda04..51afee0ff9 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prov.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 8e3ed6d46b..4974452132 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1,13 +1,10 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shell.cxx,v $
- * $Revision: 1.98 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 89e2324d74..a2c7b6e8dd 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shell.hxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/curl.hxx b/ucb/source/ucp/ftp/curl.hxx
index ed6fe22cd0..70ace6e9fd 100644
--- a/ucb/source/ucp/ftp/curl.hxx
+++ b/ucb/source/ucp/ftp/curl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: curl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcfunc.cxx b/ucb/source/ucp/ftp/ftpcfunc.cxx
index 9ec3edf0c0..7fb0944a93 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.cxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcfunc.cxx,v $
- * $Revision: 1.7.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index 95a6cd00cb..9c11779ba7 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcfunc.hxx,v $
- * $Revision: 1.6.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontainer.hxx b/ucb/source/ucp/ftp/ftpcontainer.hxx
index e49a8f7166..6c57bdf1e4 100644
--- a/ucb/source/ucp/ftp/ftpcontainer.hxx
+++ b/ucb/source/ucp/ftp/ftpcontainer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontainer.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index c3e6563d38..618d459489 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontent.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index 0d8cd8e425..85817a4e1d 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontent.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 7fc47b4cac..67d767bb14 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontentcaps.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index dc6b550c4c..c6e79a7262 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontentidentifier.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 27038ca3df..ea8355e308 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontentidentifier.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 15fcf5378b..635138a18a 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontentprovider.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 1ab2f8dd54..8f92ea55d8 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpcontentprovider.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index f25474ef53..32dd3da730 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpdirp.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index 2083a8beff..f5a1255288 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpdirp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx
index 84b711cfdd..7871181564 100644
--- a/ucb/source/ucp/ftp/ftpdynresultset.cxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpdynresultset.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx
index 8139ccacf5..4b94f59302 100644
--- a/ucb/source/ucp/ftp/ftpdynresultset.hxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpdynresultset.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpinpstr.cxx b/ucb/source/ucp/ftp/ftpinpstr.cxx
index 7600ddb6af..b58ba6e4c2 100644
--- a/ucb/source/ucp/ftp/ftpinpstr.cxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpinpstr.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpinpstr.hxx b/ucb/source/ucp/ftp/ftpinpstr.hxx
index 1ecf5e8bab..e3fbc64530 100644
--- a/ucb/source/ucp/ftp/ftpinpstr.hxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpinpstr.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index 78d3db6ecd..99692390ab 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpintreq.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 7b3fbca577..a3d1cef7ba 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpintreq.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index 930beaa873..727d056f7f 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftploaderthread.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index a12d3ecca6..ba6f23c6aa 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftploaderthread.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 40bd4569fd..86bf951957 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpresultsetI.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index 433a64ad1b..d964ee7c9e 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpresultsetI.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 12ef1cb180..4658f262cf 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpresultsetbase.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 90d001743f..daf13b6094 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpresultsetbase.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
index 7949017c38..8bf001fddf 100644
--- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpresultsetfactory.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index a8eb26069d..52ae9e9384 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpservices.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx
index 17a8cd158c..d357c495d7 100644
--- a/ucb/source/ucp/ftp/ftpstrcont.hxx
+++ b/ucb/source/ucp/ftp/ftpstrcont.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpstrcont.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 06ea07b855..85d0e5c309 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpurl.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 52103f7274..0f4d02be99 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ftpurl.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index 75f5512c72..8e0d615da3 100644
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.19 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx
index 9fd7b0281a..ea48bacf90 100644
--- a/ucb/source/ucp/ftp/test.cxx
+++ b/ucb/source/ucp/ftp/test.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx
index cd008735df..5729912bd4 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.cxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_activedatasink.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/test_activedatasink.hxx b/ucb/source/ucp/ftp/test_activedatasink.hxx
index 75835ded99..a10d531bbf 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.hxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_activedatasink.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx
index 9d7167e078..9ac8219c26 100755..100644
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_ftpurl.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/test_interactionhandler.hxx b/ucb/source/ucp/ftp/test_interactionhandler.hxx
index 51cb804cf3..6a03668525 100644
--- a/ucb/source/ucp/ftp/test_interactionhandler.hxx
+++ b/ucb/source/ucp/ftp/test_interactionhandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_interactionhandler.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx
index 6dcf8b054f..4ef9e851db 100644
--- a/ucb/source/ucp/ftp/test_multiservicefac.cxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_multiservicefac.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.hxx b/ucb/source/ucp/ftp/test_multiservicefac.hxx
index 8b55046535..5fe73408c1 100644
--- a/ucb/source/ucp/ftp/test_multiservicefac.hxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: test_multiservicefac.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index fa6d8f74c8..aafafc61a1 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_content.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 9b63edf0ba..6b1511a317 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_content.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 384c5278ac..118a6b0e76 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_datasupplier.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index c2f2ee1290..b39d7c913f 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_datasupplier.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index b173b4724c..5b5a1a9829 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_inputstream.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 1f53b7117a..4871589707 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_inputstream.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 3d1611bd50..2cee5a9ab2 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_mount.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx
index 3890e49a58..e88ef01651 100644
--- a/ucb/source/ucp/gio/gio_mount.hxx
+++ b/ucb/source/ucp/gio/gio_mount.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_mount.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 3bb20f5db5..ddd0d19e7f 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_outputstream.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index 2e5479bece..0d86fa7cd8 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_outputstream.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index d799a38fd4..2f72d95b3f 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_provider.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 0eaa21c518..4fa2fba180 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_provider.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx
index ae9019e73a..73f0cc2a46 100644
--- a/ucb/source/ucp/gio/gio_resultset.cxx
+++ b/ucb/source/ucp/gio/gio_resultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_resultset.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx
index e5edd110a9..620c58cf7e 100644
--- a/ucb/source/ucp/gio/gio_resultset.hxx
+++ b/ucb/source/ucp/gio/gio_resultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_resultset.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index 6c3b680121..6740055fbc 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_seekable.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 1c25a7aaac..8b6d9dc941 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gio_seekable.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk
index 2e7009e52a..8671ef8e26 100644
--- a/ucb/source/ucp/gio/makefile.mk
+++ b/ucb/source/ucp/gio/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/gvfs/content.cxx b/ucb/source/ucp/gvfs/content.cxx
index 2eb0ac2e00..fad5f0116a 100644
--- a/ucb/source/ucp/gvfs/content.cxx
+++ b/ucb/source/ucp/gvfs/content.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: content.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/content.hxx b/ucb/source/ucp/gvfs/content.hxx
index 31254b8733..2284726509 100644
--- a/ucb/source/ucp/gvfs/content.hxx
+++ b/ucb/source/ucp/gvfs/content.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: content.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/directory.cxx b/ucb/source/ucp/gvfs/directory.cxx
index ff699a3c63..4d1355272c 100644
--- a/ucb/source/ucp/gvfs/directory.cxx
+++ b/ucb/source/ucp/gvfs/directory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: directory.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/directory.hxx b/ucb/source/ucp/gvfs/directory.hxx
index d5124eedb6..5fc204e77b 100644
--- a/ucb/source/ucp/gvfs/directory.hxx
+++ b/ucb/source/ucp/gvfs/directory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: directory.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk
index 889e3ffd41..f4a46e63c8 100644
--- a/ucb/source/ucp/gvfs/makefile.mk
+++ b/ucb/source/ucp/gvfs/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/gvfs/provider.cxx b/ucb/source/ucp/gvfs/provider.cxx
index eec5dd1296..e24cb9c350 100644
--- a/ucb/source/ucp/gvfs/provider.cxx
+++ b/ucb/source/ucp/gvfs/provider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provider.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/provider.hxx b/ucb/source/ucp/gvfs/provider.hxx
index 4aa024ee96..fd9e7dfd78 100644
--- a/ucb/source/ucp/gvfs/provider.hxx
+++ b/ucb/source/ucp/gvfs/provider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provider.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/stream.cxx b/ucb/source/ucp/gvfs/stream.cxx
index 7ea1e95619..749f79963b 100644
--- a/ucb/source/ucp/gvfs/stream.cxx
+++ b/ucb/source/ucp/gvfs/stream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stream.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/gvfs/stream.hxx b/ucb/source/ucp/gvfs/stream.hxx
index a621c08e98..57d807ca37 100644
--- a/ucb/source/ucp/gvfs/stream.hxx
+++ b/ucb/source/ucp/gvfs/stream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: stream.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
index f0c7ecf4f9..0cb8fec28e 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dynamicresultset.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
index 7d06819ef9..9553b299b0 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dynamicresultset.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 49774e943f..27600a4474 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchycontent.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 168ada3b23..f21f987c4e 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchycontent.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index 2adaa8cbb3..2dddc57edd 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchycontentcaps.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index eb88177691..d3f0c35cd4 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchydata.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index 4add72a283..77a6d54c62 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchydata.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 933beec7f7..ce0469f25e 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchydatasource.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 4681a53df2..329011e142 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchydatasource.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index d254d4259b..a99136504c 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchydatasupplier.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index a18d450310..149f2a837b 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchydatasupplier.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index cef8e4759e..5ce8ea891f 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchyprovider.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 4d2f09142a..5ec2b122ab 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchyprovider.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 6df458de86..e645e00603 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchyservices.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 7339e34341..cc7bcb006a 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchyuri.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index 46b9e92a0d..012d59bb4c 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: hierarchyuri.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk
index b71ee7fa18..441d22dc15 100644
--- a/ucb/source/ucp/hierarchy/makefile.mk
+++ b/ucb/source/ucp/hierarchy/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx
index a3618293ed..5ab7dd29f3 100644
--- a/ucb/source/ucp/inc/urihelper.hxx
+++ b/ucb/source/ucp/inc/urihelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: urihelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
index 290898e655..feb8ad5834 100644
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 80d5114e09..7a8edf2697 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_content.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_content.hxx b/ucb/source/ucp/odma/odma_content.hxx
index 6c824176ed..0ba461bc18 100644
--- a/ucb/source/ucp/odma/odma_content.hxx
+++ b/ucb/source/ucp/odma/odma_content.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_content.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_contentcaps.cxx b/ucb/source/ucp/odma/odma_contentcaps.cxx
index a9df4574c4..2b70aff156 100644
--- a/ucb/source/ucp/odma/odma_contentcaps.cxx
+++ b/ucb/source/ucp/odma/odma_contentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_contentcaps.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_contentprops.hxx b/ucb/source/ucp/odma/odma_contentprops.hxx
index a5b5c7e41e..bbeb1c402a 100644
--- a/ucb/source/ucp/odma/odma_contentprops.hxx
+++ b/ucb/source/ucp/odma/odma_contentprops.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_contentprops.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index ad1d6151e2..055ff87624 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_datasupplier.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_datasupplier.hxx b/ucb/source/ucp/odma/odma_datasupplier.hxx
index d9624d20f0..a37ecebf0e 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.hxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_datasupplier.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_inputstream.cxx b/ucb/source/ucp/odma/odma_inputstream.cxx
index 6de50a90c2..fff23a7bd4 100644
--- a/ucb/source/ucp/odma/odma_inputstream.cxx
+++ b/ucb/source/ucp/odma/odma_inputstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_inputstream.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_inputstream.hxx b/ucb/source/ucp/odma/odma_inputstream.hxx
index 93ae4a066b..491ce46704 100644
--- a/ucb/source/ucp/odma/odma_inputstream.hxx
+++ b/ucb/source/ucp/odma/odma_inputstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_inputstream.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index e837c51ad6..adc912b923 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_lib.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_lib.hxx b/ucb/source/ucp/odma/odma_lib.hxx
index 2fbc1cda1e..716964ad5c 100644
--- a/ucb/source/ucp/odma/odma_lib.hxx
+++ b/ucb/source/ucp/odma/odma_lib.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_lib.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index 47152d0921..0c469f82c3 100644
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_main.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index a124ff077b..0679c6b322 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_provider.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index 682e44fa64..e2600fa8ce 100644
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_provider.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_resultset.cxx b/ucb/source/ucp/odma/odma_resultset.cxx
index 2fdd2aa0fd..82e6b271fc 100644
--- a/ucb/source/ucp/odma/odma_resultset.cxx
+++ b/ucb/source/ucp/odma/odma_resultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_resultset.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_resultset.hxx b/ucb/source/ucp/odma/odma_resultset.hxx
index cb1ac90597..77787b1fcc 100644
--- a/ucb/source/ucp/odma/odma_resultset.hxx
+++ b/ucb/source/ucp/odma/odma_resultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_resultset.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 1acb689f86..3e4639e258 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: odma_services.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk
index 4b4f066ac1..ea4653bb87 100644
--- a/ucb/source/ucp/package/makefile.mk
+++ b/ucb/source/ucp/package/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.11 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index eafac3d769..1f67582104 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgcontent.cxx,v $
- * $Revision: 1.59 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 0673465d5c..b18c59b696 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgcontent.hxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index 6e6e4a9123..d6754a0419 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgcontentcaps.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index c465e8d7b4..2b8dcfc426 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgdatasupplier.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index e0eeccbefb..2342becad8 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgdatasupplier.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 434fe969e0..92c35fe78b 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgprovider.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 8d84e8cb54..26b960f08a 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgprovider.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx
index 5320b2b16f..076e7aa691 100644
--- a/ucb/source/ucp/package/pkgresultset.cxx
+++ b/ucb/source/ucp/package/pkgresultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgresultset.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx
index 6d9fca191e..43621f8adf 100644
--- a/ucb/source/ucp/package/pkgresultset.hxx
+++ b/ucb/source/ucp/package/pkgresultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgresultset.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 202edf41f8..acafac8505 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkgservices.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index a246d9cbd5..4bd8b1c28a 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkguri.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index 42949afd51..195e82170a 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: pkguri.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk
index 1c2c44b124..73a253b65a 100644
--- a/ucb/source/ucp/tdoc/makefile.mk
+++ b/ucb/source/ucp/tdoc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 308dd0a934..8f23e3a84a 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_content.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 1e6f03544b..22350ff9ff 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_content.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index b9a1410b55..d4049785cf 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_contentcaps.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 4ea50aba52..c9931c872b 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_datasupplier.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index 4e88e63d65..f95c2c91b0 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_datasupplier.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 0d1b236397..46aa1ae69e 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_docmgr.cxx,v $
- * $Revision: 1.19.24.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index ddf990fb4c..8f8b2fc117 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_docmgr.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index 7ce9b01f95..72c5f700aa 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_documentcontentfactory.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 4960777adb..7a2d919e57 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_documentcontentfactory.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index d0c438543c..9d8a3ffca5 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_passwordrequest.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
index cad379ed63..bc170bece6 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_passwordrequest.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 684e4bb609..7ffedfcf19 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_provider.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 3ad5d147cd..70f61e1309 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_provider.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
index 915d7e416a..d8212fa028 100644
--- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_resultset.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
index bd0c064804..a3e420894a 100644
--- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_resultset.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 4b507f7a2f..6f9641d515 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_services.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 6e0e327174..0bd25f94d0 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_stgelems.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 76917a15f3..9afa15abf9 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_stgelems.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 0ce268bb15..8deb942900 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_storage.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index 0c858d5bd4..39a95a5a7f 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_storage.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 2eef39f6e0..712ced2d04 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_uri.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index b4e75d327a..5f251cc55b 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tdoc_uri.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index 4cc975070d..bd912fa3b8 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ContentProperties.cxx,v $
- * $Revision: 1.12.18.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 4fb9af57f2..2ed9f9975e 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ContentProperties.hxx,v $
- * $Revision: 1.12.34.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx
index 6a4a84db81..c092f9fd31 100644
--- a/ucb/source/ucp/webdav/DAVAuthListener.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVAuthListener.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
index 2192e1fcca..4c7d6aaf1f 100644
--- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVAuthListenerImpl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx
index 4e281543c8..80a51a6f27 100644
--- a/ucb/source/ucp/webdav/DAVException.hxx
+++ b/ucb/source/ucp/webdav/DAVException.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVException.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index e3a1edd700..6dc217d73d 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVProperties.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx
index cd87f8238e..46effc8469 100644
--- a/ucb/source/ucp/webdav/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav/DAVProperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVProperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
index d8cbe527c6..c4a5ae771d 100644
--- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
+++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVRequestEnvironment.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx
index 8dc62f4171..fc894fa762 100644
--- a/ucb/source/ucp/webdav/DAVResource.hxx
+++ b/ucb/source/ucp/webdav/DAVResource.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVResource.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index f26caaedc2..62e68fb282 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVResourceAccess.cxx,v $
- * $Revision: 1.29.16.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 0d40b57bfb..013cb2ae8f 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVResourceAccess.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx
index 9070b086d6..65f8b98b80 100644
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVSession.hxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index fba6318638..c19c19e41d 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVSessionFactory.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 0b41f5e5fe..34af3a6869 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVSessionFactory.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx
index 3d9173f820..3deccca05e 100644
--- a/ucb/source/ucp/webdav/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav/DAVTypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DAVTypes.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx
index 4ce2e08c29..41caac39f6 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DateTimeHelper.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx
index eb8999bca0..c857457d05 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DateTimeHelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx
index f890122dec..a79f9eb196 100644
--- a/ucb/source/ucp/webdav/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav/LinkSequence.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LinkSequence.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/LinkSequence.hxx b/ucb/source/ucp/webdav/LinkSequence.hxx
index 368becfb06..49bf883f10 100644
--- a/ucb/source/ucp/webdav/LinkSequence.hxx
+++ b/ucb/source/ucp/webdav/LinkSequence.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LinkSequence.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index 6d997bd0a6..e7ed51d0ce 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LockEntrySequence.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/LockEntrySequence.hxx b/ucb/source/ucp/webdav/LockEntrySequence.hxx
index 7c81a5f215..12c407100e 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.hxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LockEntrySequence.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav/LockSequence.cxx
index b959ddc109..d540c8570d 100644
--- a/ucb/source/ucp/webdav/LockSequence.cxx
+++ b/ucb/source/ucp/webdav/LockSequence.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LockSequence.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/LockSequence.hxx b/ucb/source/ucp/webdav/LockSequence.hxx
index 79fbe4dba5..85d4cdee77 100644
--- a/ucb/source/ucp/webdav/LockSequence.hxx
+++ b/ucb/source/ucp/webdav/LockSequence.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: LockSequence.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.cxx b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
index 36208be7b0..2880a86a72 100644
--- a/ucb/source/ucp/webdav/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonHeadRequest.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.hxx b/ucb/source/ucp/webdav/NeonHeadRequest.hxx
index 6e44df3bb1..eb79ae7658 100644
--- a/ucb/source/ucp/webdav/NeonHeadRequest.hxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonHeadRequest.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx
index 3fdd0dbecd..2e142af955 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonInputStream.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonInputStream.hxx b/ucb/source/ucp/webdav/NeonInputStream.hxx
index 4d95c3eedd..c7fee59ffb 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonInputStream.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index ab1132fa88..a79e418655 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonPropFindRequest.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
index 1e6d3a07b2..26e8793e2b 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonPropFindRequest.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 2600c10c51..170e601ae1 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonSession.cxx,v $
- * $Revision: 1.55.12.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav/NeonSession.hxx
index 85daecd8e4..d43ee5b0db 100644
--- a/ucb/source/ucp/webdav/NeonSession.hxx
+++ b/ucb/source/ucp/webdav/NeonSession.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonSession.hxx,v $
- * $Revision: 1.31.12.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonTypes.hxx b/ucb/source/ucp/webdav/NeonTypes.hxx
index 08c7d07460..b5c147305f 100644
--- a/ucb/source/ucp/webdav/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav/NeonTypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonTypes.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index ed8315b1cd..0cd32922f2 100644
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonUri.cxx,v $
- * $Revision: 1.25.16.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/NeonUri.hxx b/ucb/source/ucp/webdav/NeonUri.hxx
index 1b54085e53..22d0ccc05d 100644
--- a/ucb/source/ucp/webdav/NeonUri.hxx
+++ b/ucb/source/ucp/webdav/NeonUri.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NeonUri.hxx,v $
- * $Revision: 1.14.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx
index 14e915bc1c..624187b174 100644
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyMap.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index 012bd85c92..d42aa25879 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UCBDeadPropertyValue.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
index 77aa746587..69dc5d3c80 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: UCBDeadPropertyValue.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index c8891723cd..270bb81191 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.43 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 9dd59c4441..d2a1ab074e 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavcontent.cxx,v $
- * $Revision: 1.65.12.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 030fcc2b7e..26fae76642 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavcontent.hxx,v $
- * $Revision: 1.23.32.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 16800fb29c..2f60d770a0 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavcontentcaps.cxx,v $
- * $Revision: 1.21.20.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index d36867da6e..b03eb0ffb4 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavdatasupplier.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
index 4d555982f9..b28263df02 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavdatasupplier.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index d6caf7aafe..cc9c69a15e 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavprovider.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 2b9af841f5..6583c8d2d9 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavprovider.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx
index 330d49abe2..cf4cc88fd1 100644
--- a/ucb/source/ucp/webdav/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav/webdavresultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavresultset.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx
index f05227e9f9..a438cc208e 100644
--- a/ucb/source/ucp/webdav/webdavresultset.hxx
+++ b/ucb/source/ucp/webdav/webdavresultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavresultset.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 2bf66572b7..9fb6d9e82b 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: webdavservices.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
index 6ffb4e18ff..72670bc314 100644
--- a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
+++ b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GlobalTransfer_Test.java,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/test/com/sun/star/comp/ucb/makefile.mk b/ucb/test/com/sun/star/comp/ucb/makefile.mk
index 529b2c6051..42aa32bc8e 100644
--- a/ucb/test/com/sun/star/comp/ucb/makefile.mk
+++ b/ucb/test/com/sun/star/comp/ucb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx
index 03e29cec15..f37afa9814 100644
--- a/ucb/workben/cachemap/cachemapobject1.cxx
+++ b/ucb/workben/cachemap/cachemapobject1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobject1.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index 99e947204b..fe72943447 100644
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobject1.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemapobject2.hxx b/ucb/workben/cachemap/cachemapobject2.hxx
index c229e96c19..812f3b8e8a 100644
--- a/ucb/workben/cachemap/cachemapobject2.hxx
+++ b/ucb/workben/cachemap/cachemapobject2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobject2.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx
index bfab8c4954..f8787109e3 100644
--- a/ucb/workben/cachemap/cachemapobject3.cxx
+++ b/ucb/workben/cachemap/cachemapobject3.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobject3.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index 0cf2c982a1..1096d3babc 100644
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobject3.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
index 21e762c343..3af959c17c 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobjectcontainer2.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
index a9686a4bf9..1ec7cf8293 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemapobjectcontainer2.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx
index 4e632de94b..25f10f3318 100644
--- a/ucb/workben/cachemap/cachemaptest.cxx
+++ b/ucb/workben/cachemap/cachemaptest.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cachemaptest.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/cachemap/makefile.mk b/ucb/workben/cachemap/makefile.mk
index a42d7ec5f4..0d29a71a53 100644
--- a/ucb/workben/cachemap/makefile.mk
+++ b/ucb/workben/cachemap/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
index baf0a11de0..093fd62256 100644
--- a/ucb/workben/ucb/makefile.mk
+++ b/ucb/workben/ucb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx
index 0997a90f19..92b6dd1887 100644
--- a/ucb/workben/ucb/srcharg.cxx
+++ b/ucb/workben/ucb/srcharg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srcharg.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/ucb/srcharg.hxx b/ucb/workben/ucb/srcharg.hxx
index 3cd82ff44b..822c063d5b 100644
--- a/ucb/workben/ucb/srcharg.hxx
+++ b/ucb/workben/ucb/srcharg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: srcharg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index c2d58f2ef1..190680d05e 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ucbdemo.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 1f2b170f60..d3b96d4e26 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.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: openlocked.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/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index 2ba2db8a06..b265aee859 100644
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.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: openlocked.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/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
index e4222af91d..928973947e 100644
--- a/uui/source/alreadyopen.src
+++ b/uui/source/alreadyopen.src
@@ -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: openlocked.src,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/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index 98a91fd9f5..b4723bcbbf 100644
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cookiedg.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/cookiedg.hrc b/uui/source/cookiedg.hrc
index 84e219aed7..f245c57d10 100644
--- a/uui/source/cookiedg.hrc
+++ b/uui/source/cookiedg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cookiedg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx
index 6cfa190b1f..bc697835c3 100644
--- a/uui/source/cookiedg.hxx
+++ b/uui/source/cookiedg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cookiedg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src
index bc45126724..9df0d481d6 100644
--- a/uui/source/cookiedg.src
+++ b/uui/source/cookiedg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cookiedg.src,v $
- * $Revision: 1.33 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 31e942309c..900336d043 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.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: openlocked.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/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index 76f4ad3e8e..09c542d1f7 100644
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.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: openlocked.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/uui/source/filechanged.src b/uui/source/filechanged.src
index 4ebf0826e0..fa07c40c08 100644
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -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: openlocked.src,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/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index cd617988d0..873630f88d 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltdlg.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/fltdlg.hrc b/uui/source/fltdlg.hrc
index ec5bda8215..ce65c2b665 100644
--- a/uui/source/fltdlg.hrc
+++ b/uui/source/fltdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltdlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index e6e679d658..7284ae0014 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltdlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src
index ac04d13974..825f0200dd 100644
--- a/uui/source/fltdlg.src
+++ b/uui/source/fltdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fltdlg.src,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 127a9bcbd6..6db79e3b98 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.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: iahndl.cxx,v $
- * $Revision: 1.67.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 177273a032..b9335a2317 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: iahndl.hxx,v $
- * $Revision: 1.21.22.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index bbfcaf7764..65b370a09a 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -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: ids.hrc,v $
- * $Revision: 1.26.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/ids.src b/uui/source/ids.src
index ddd422b01a..439410b857 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ids.src,v $
- * $Revision: 1.69 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index dd8a875ff0..f158c9838f 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interactionhandler.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
index d420507b10..d470a07c97 100644
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: interactionhandler.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 20a3ff4798..7591deaff1 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.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: openlocked.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/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index 9d36803747..2336d366ba 100644
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.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: openlocked.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/uui/source/lockfailed.src b/uui/source/lockfailed.src
index 6b21d6fc64..66d6a1d4bb 100644
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
@@ -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: openlocked.src,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/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 99bbfac627..1da04464cc 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logindlg.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc
index d13afae854..2284f4ccc8 100644
--- a/uui/source/logindlg.hrc
+++ b/uui/source/logindlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logindlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index e3cbea5d41..2568842544 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logindlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index 88dec194fb..ce998f4945 100644
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logindlg.src,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index 49aaf818e5..0b9aac3b2a 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: loginerr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk
index 95b998ffd3..764c388acf 100644
--- a/uui/source/makefile.mk
+++ b/uui/source/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.12.22.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 460cc4e342..2a412b58b1 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.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: masterpasscrtdlg.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/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc
index dbee5a44ec..4262769b0e 100644
--- a/uui/source/masterpasscrtdlg.hrc
+++ b/uui/source/masterpasscrtdlg.hrc
@@ -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: masterpasscrtdlg.hrc,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/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 88581264f2..90baffbb56 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.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: masterpasscrtdlg.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/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
index e11d9abd16..870cc8a245 100644
--- a/uui/source/masterpasscrtdlg.src
+++ b/uui/source/masterpasscrtdlg.src
@@ -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: masterpasscrtdlg.src,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 9a5e667e43..8b3b031972 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: masterpassworddlg.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc
index 32649dd578..8c6a2ac10c 100644
--- a/uui/source/masterpassworddlg.hrc
+++ b/uui/source/masterpassworddlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: masterpassworddlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 228e2ea223..0fe30ec6eb 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: masterpassworddlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 436d44d13f..c0e01bd5b8 100644
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: masterpassworddlg.src,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/mphndl.hxx b/uui/source/mphndl.hxx
index 14d0cf9ffe..5523af6ae1 100644
--- a/uui/source/mphndl.hxx
+++ b/uui/source/mphndl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: mphndl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 9738b4b043..0cc9df17cd 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newerverwarn.cxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/newerverwarn.hrc b/uui/source/newerverwarn.hrc
index 622c799da3..9097cf026b 100644
--- a/uui/source/newerverwarn.hrc
+++ b/uui/source/newerverwarn.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newerverwarn.hrc,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index 831751728d..574f3587da 100644
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newerverwarn.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src
index 93bbd6e991..3de289d69b 100644
--- a/uui/source/newerverwarn.src
+++ b/uui/source/newerverwarn.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: newerverwarn.src,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 761ea3d8d2..6112f157ca 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 1336c5c2f0..c72704848f 100644
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
index 58d65f54a4..9ec0757743 100644
--- a/uui/source/openlocked.src
+++ b/uui/source/openlocked.src
@@ -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: openlocked.src,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/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index 9a98bad6c1..79bc732b75 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passcrtdlg.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc
index db0c54c3cc..5a999aa992 100644
--- a/uui/source/passcrtdlg.hrc
+++ b/uui/source/passcrtdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passcrtdlg.hrc,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passcrtdlg.hxx b/uui/source/passcrtdlg.hxx
index 76f0435fc7..b3c36aa78b 100644
--- a/uui/source/passcrtdlg.hxx
+++ b/uui/source/passcrtdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passcrtdlg.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src
index 2425112e2e..e06b7c229d 100644
--- a/uui/source/passcrtdlg.src
+++ b/uui/source/passcrtdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passcrtdlg.src,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 77707d3b9b..a9c92708da 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passworddlg.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc
index d6d69b3955..ad7517b7a6 100644
--- a/uui/source/passworddlg.hrc
+++ b/uui/source/passworddlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passworddlg.hrc,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 18c4996a7a..2d17686aed 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passworddlg.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 1a22bc1f08..96863ad9ca 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passworddlg.src,v $
- * $Revision: 1.42 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
index 6bb98d1bdb..fe631257c9 100644
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: passworderrs.src,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 8b8be7c62d..01098a2f6c 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: requeststringresolver.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 9d12a48c10..a01de5a82a 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: requeststringresolver.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index db272a88f9..d0347cd2e4 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: secmacrowarnings.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc
index c77b7d53f6..fe661322c7 100644
--- a/uui/source/secmacrowarnings.hrc
+++ b/uui/source/secmacrowarnings.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: secmacrowarnings.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index bce3f96a0c..ce568d9b71 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: secmacrowarnings.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src
index 1d6176f12a..6d0039da77 100644
--- a/uui/source/secmacrowarnings.src
+++ b/uui/source/secmacrowarnings.src
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: secmacrowarnings.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index a72f414591..c835c7f436 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: services.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 29f3cd2ce1..15cbd5e2f1 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sslwarndlg.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/sslwarndlg.hrc b/uui/source/sslwarndlg.hrc
index b31d3b4140..41e527026b 100644
--- a/uui/source/sslwarndlg.hrc
+++ b/uui/source/sslwarndlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sslwarndlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index d4e74439cb..f4fa25e4b9 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sslwarndlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src
index 0145d85c6b..6f32c9abb2 100644
--- a/uui/source/sslwarndlg.src
+++ b/uui/source/sslwarndlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sslwarndlg.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 9e7857dfc8..893455d134 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.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: openlocked.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/uui/source/trylater.hxx b/uui/source/trylater.hxx
index 64140966fb..cb8082b4a6 100644
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.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: openlocked.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/uui/source/trylater.src b/uui/source/trylater.src
index 945ac8c741..4f328fed7c 100644
--- a/uui/source/trylater.src
+++ b/uui/source/trylater.src
@@ -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: openlocked.src,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/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index d64a636eca..e8f4a62aeb 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unknownauthdlg.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/unknownauthdlg.hrc b/uui/source/unknownauthdlg.hrc
index 6c4c19f34f..6d4aca23d9 100644
--- a/uui/source/unknownauthdlg.hrc
+++ b/uui/source/unknownauthdlg.hrc
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unknownauthdlg.hrc,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index d376dfd96d..9bc2996639 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unknownauthdlg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src
index c8f57b9276..610c69d414 100644
--- a/uui/source/unknownauthdlg.src
+++ b/uui/source/unknownauthdlg.src
@@ -1,13 +1,10 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unknownauthdlg.src,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk
index a262b94438..b0209faa69 100644
--- a/uui/util/makefile.mk
+++ b/uui/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
index b12c06c14f..524a9b0874 100644
--- a/xmlhelp/inc/makefile.mk
+++ b/xmlhelp/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
index 7b6e9939dd..bc456b09b9 100644
--- a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
+++ b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_xmlhelp.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
index 25a4c7979b..5efff61ff7 100644
--- a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
+++ b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_xmlhelp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java
index b27ea5bb78..0f0dc979ec 100755..100644
--- a/xmlhelp/source/com/sun/star/help/HelpComponent.java
+++ b/xmlhelp/source/com/sun/star/help/HelpComponent.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HelpSearch.java,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
index 5fecf5abe6..e9af50e848 100644
--- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java
+++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HelpIndexer.java,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index 86d83b1ccf..7d95cce79b 100644
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HelpSearch.java,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/com/sun/star/help/helplinker.pmk b/xmlhelp/source/com/sun/star/help/helplinker.pmk
index 569c5f4dbd..e435c5e70c 100644
--- a/xmlhelp/source/com/sun/star/help/helplinker.pmk
+++ b/xmlhelp/source/com/sun/star/help/helplinker.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: helplinker.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index 0d82dd8665..cfc91fc9ff 100644
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.38 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
index 72599d58cd..7470aa25e8 100644
--- a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EntryProcessor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
index b64fe10c50..4f5aea9f2c 100644
--- a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
+++ b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XmlSearchExceptions.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx b/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 46ca7405b8..18e293a7ad 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocGenerator.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index cc72e77f71..b73eda64d7 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Query.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Search.hxx b/xmlhelp/source/cxxhelp/inc/qe/Search.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/Search.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx b/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
index 098562381f..36a587a659 100644
--- a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CompressorIterator.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
index bbb2997e30..ec61b64f92 100644
--- a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ConceptList.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index 19ec1e726f..368be7b800 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Decompressor.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
index b3a53d0bbb..928aa6a96c 100644
--- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RandomAccessStream.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
index 53489d279c..fa758bd889 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bufferedinputstream.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
index 9394ae1c2b..3b5e052f7f 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bufferedinputstream.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 0dd138ac3d..291a041b84 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: content.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 1a6635ae81..b18ea50b84 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: content.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 2c3590b827..9ed15eff39 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contentcaps.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 92ad0446ea..e68bb22b51 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: databases.cxx,v $
- * $Revision: 1.54 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index b213930719..d31742cacd 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: databases.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index 989bed4a96..9ba8a88e9d 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: db.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 82b6374321..575a6308fa 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: db.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index c5d00d8391..62c96c52a4 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: inputstream.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index 6c31cd9fa6..21c60c6a51 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: inputstream.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index dee7d40d95..26dcfac9bf 100644
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.21 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 87dd04cb06..91b51c2226 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provider.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index ec7d08bd82..5edeeee69a 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: provider.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index 47e2ec2b3c..c529d67761 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultset.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
index 87de9b2be8..3c4e92a5b7 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultset.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 9923e1f2e2..5af5bd32aa 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultsetbase.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 53dda08b47..400509d6b8 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultsetbase.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index e0602f5efa..7b05ae9b86 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultsetforquery.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,8 +43,8 @@
 #define INCLUDED_STL_SET
 #endif
 
-#include <qe/Query.hxx>

-#include <qe/DocGenerator.hxx>

+#include <qe/Query.hxx>
+#include <qe/DocGenerator.hxx>
 #include "resultsetforquery.hxx"
 #include "databases.hxx"
 
@@ -161,8 +158,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
             try
             {
                 vector< vector<HitItem>* > aQueryListResultVectorVector;
-                set< rtl::OUString > aSet,aCurrent,aResultSet;

-

+                set< rtl::OUString > aSet,aCurrent,aResultSet;
+
                 int nQueryListSize = queryList.size();
                 if( nQueryListSize > 1 )
                     hitCount = 2000;
@@ -181,25 +178,25 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                     }
                     pQueryResultVector->reserve( hitCount );
 
-                    int nParamCount = bCaptionsOnly ? 7 : 6;

-                    Sequence<uno::Any> aParamsSeq( nParamCount );

-

-                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );

-                    aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );

-                    

-                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );

-                    rtl::OUString aSystemPath;

-                    osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );

-                    aParamsSeq[3] = uno::makeAny( aSystemPath );

-

-                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );

-

-                    const std::vector< rtl::OUString >& aListItem = queryList[i];

-                    ::rtl::OUString aNewQueryStr = aListItem[0];

-                    aParamsSeq[5] = uno::makeAny( aNewQueryStr );

-

-                    if( bCaptionsOnly )

-                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );

+                    int nParamCount = bCaptionsOnly ? 7 : 6;
+                    Sequence<uno::Any> aParamsSeq( nParamCount );
+
+                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                    aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
+                    
+                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );
+                    rtl::OUString aSystemPath;
+                    osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
+                    aParamsSeq[3] = uno::makeAny( aSystemPath );
+
+                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );
+
+                    const std::vector< rtl::OUString >& aListItem = queryList[i];
+                    ::rtl::OUString aNewQueryStr = aListItem[0];
+                    aParamsSeq[5] = uno::makeAny( aNewQueryStr );
+
+                    if( bCaptionsOnly )
+                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );
 
                     Sequence< sal_Int16 > aOutParamIndex;
                     Sequence< uno::Any > aOutParam;
@@ -248,22 +245,22 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                         }
                     }
 
-                    // intersect

+                    // intersect
                     if( nQueryListSize > 1 )
                     {
-                        if( i == 0 )

-                        {

-                            aResultSet = aSet;

-                        }

-                        else

-                        {

-                            aCurrent = aResultSet;

-                            aResultSet.clear();

-                            set_intersection( aSet.begin(),aSet.end(),

-                                              aCurrent.begin(),aCurrent.end(),

-                                              inserter(aResultSet,aResultSet.begin()));

-                        }

-                    }

+                        if( i == 0 )
+                        {
+                            aResultSet = aSet;
+                        }
+                        else
+                        {
+                            aCurrent = aResultSet;
+                            aResultSet.clear();
+                            set_intersection( aSet.begin(),aSet.end(),
+                                              aCurrent.begin(),aCurrent.end(),
+                                              inserter(aResultSet,aResultSet.begin()));
+                        }
+                    }
                 }
 
                 // Combine results in aIndexFolderResultVector
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index a596a9f35c..dad01141d0 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultsetforquery.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 12b1712f18..84250177a9 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultsetforroot.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
index 9b743eb3f1..4be47ae3c5 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: resultsetforroot.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index b13ab8cd1f..dbdbd02d37 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: services.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 50c2bdbc9c..477f5ee9e7 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: urlparameter.cxx,v $
- * $Revision: 1.44 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 577fb32c4c..a117c262d2 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: urlparameter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index fd6c468fba..14f9bf5f69 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocGenerator.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk
index 249950c4f0..095bf99318 100644
--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
+++ b/xmlhelp/source/cxxhelp/qe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/cxxhelp/test/abidebug.hxx b/xmlhelp/source/cxxhelp/test/abidebug.hxx
index cae6094553..4bffdea764 100644
--- a/xmlhelp/source/cxxhelp/test/abidebug.hxx
+++ b/xmlhelp/source/cxxhelp/test/abidebug.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: abidebug.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/test/makefile.mk b/xmlhelp/source/cxxhelp/test/makefile.mk
index 357aae6af0..d696c05d7d 100644
--- a/xmlhelp/source/cxxhelp/test/makefile.mk
+++ b/xmlhelp/source/cxxhelp/test/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index 028e37c794..23e0c1ba78 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: searchdemo.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
index 77cd90cdb9..63e399c737 100644
--- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx
+++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Decompressor.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk
index 8e25c8584c..58752015af 100644
--- a/xmlhelp/source/cxxhelp/util/makefile.mk
+++ b/xmlhelp/source/cxxhelp/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
index 8334f233a0..fd8105e377 100644
--- a/xmlhelp/source/treeview/makefile.mk
+++ b/xmlhelp/source/treeview/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.9 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index b8fa21c7c1..99f0c27840 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tvfactory.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/treeview/tvfactory.hxx b/xmlhelp/source/treeview/tvfactory.hxx
index fc13a88b9a..d5eb1480c2 100644
--- a/xmlhelp/source/treeview/tvfactory.hxx
+++ b/xmlhelp/source/treeview/tvfactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tvfactory.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index d94d7f92ad..8f8320ad82 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tvread.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx
index f04538a7b6..28be286ccc 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tvread.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index 8b2a951713..1db6ec3362 100644
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/dtd/Blocklist.dtd b/xmloff/dtd/Blocklist.dtd
index e1551fc311..d215cc6363 100644
--- a/xmloff/dtd/Blocklist.dtd
+++ b/xmloff/dtd/Blocklist.dtd
@@ -1,32 +1,28 @@
 <!--
 
   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: Blocklist.dtd,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <!ELEMENT block-list:block-list (block-list:block*) >
 <!ATTLIST block-list:block-list
diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod
index 203b363b37..f6ce47bd57 100644
--- a/xmloff/dtd/chart.mod
+++ b/xmloff/dtd/chart.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: chart.mod,v $
- 
-  $Revision: 1.35 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 
diff --git a/xmloff/dtd/datastyl.mod b/xmloff/dtd/datastyl.mod
index 22aaafac90..6fda830195 100644
--- a/xmloff/dtd/datastyl.mod
+++ b/xmloff/dtd/datastyl.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: datastyl.mod,v $
- 
-  $Revision: 1.14 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- data styles -->
diff --git a/xmloff/dtd/defs.mod b/xmloff/dtd/defs.mod
index 7909d5c9db..5fadb5e5fd 100644
--- a/xmloff/dtd/defs.mod
+++ b/xmloff/dtd/defs.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: defs.mod,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- This module should contain entities intended for content definitions
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index a67f061849..05ea3974d4 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: drawing.mod,v $
- 
-  $Revision: 1.92 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % points "CDATA" >
diff --git a/xmloff/dtd/dtypes.mod b/xmloff/dtd/dtypes.mod
index d051afc7a5..8687556d7a 100644
--- a/xmloff/dtd/dtypes.mod
+++ b/xmloff/dtd/dtypes.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: dtypes.mod,v $
- 
-  $Revision: 1.18 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- datatypes corresponding to XML Schema Part 2 W3C Working draft of	-->
diff --git a/xmloff/dtd/form.mod b/xmloff/dtd/form.mod
index e8d832d7eb..a3f13fd675 100644
--- a/xmloff/dtd/form.mod
+++ b/xmloff/dtd/form.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: form.mod,v $
- 
-  $Revision: 1.23 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % controls	"form:text|form:textarea|form:fixed-text|form:file|
diff --git a/xmloff/dtd/meta.mod b/xmloff/dtd/meta.mod
index 15ff343000..c180426329 100644
--- a/xmloff/dtd/meta.mod
+++ b/xmloff/dtd/meta.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: meta.mod,v $
- 
-  $Revision: 1.6 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 
diff --git a/xmloff/dtd/nmspace.mod b/xmloff/dtd/nmspace.mod
index 3ac5504d7e..20884a0b79 100644
--- a/xmloff/dtd/nmspace.mod
+++ b/xmloff/dtd/nmspace.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: nmspace.mod,v $
- 
-  $Revision: 1.8 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY nFO "http://www.w3.org/1999/XSL/Format">
diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd
index c7333f2781..adfbd3891c 100644
--- a/xmloff/dtd/office.dtd
+++ b/xmloff/dtd/office.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: office.dtd,v $
- 
-  $Revision: 1.9 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % dtypes-mod SYSTEM "dtypes.mod">
diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod
index e45356d915..52dab4c7bd 100644
--- a/xmloff/dtd/office.mod
+++ b/xmloff/dtd/office.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: office.mod,v $
- 
-  $Revision: 1.52 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT office:document ( office:meta?,
diff --git a/xmloff/dtd/openoffice-2.0-schema.rng b/xmloff/dtd/openoffice-2.0-schema.rng
index 248706c5b7..dcc403f67e 100644
--- a/xmloff/dtd/openoffice-2.0-schema.rng
+++ b/xmloff/dtd/openoffice-2.0-schema.rng
@@ -2,32 +2,28 @@
 <!--
 
   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: openoffice-2.0-schema.rng,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <grammar
diff --git a/xmloff/dtd/script.mod b/xmloff/dtd/script.mod
index 1c08995c82..3214d92ea1 100644
--- a/xmloff/dtd/script.mod
+++ b/xmloff/dtd/script.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: script.mod,v $
- 
-  $Revision: 1.11 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT script:libraries (script:library-embedded | script:library-linked)*>
diff --git a/xmloff/dtd/settings.mod b/xmloff/dtd/settings.mod
index 58297320f5..32ef2c3f77 100644
--- a/xmloff/dtd/settings.mod
+++ b/xmloff/dtd/settings.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: settings.mod,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT office:settings (config:config-item-set+)>
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index b839b7afc2..72d781bc8d 100644
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: style.mod,v $
- 
-  $Revision: 1.64 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT style:font-decl EMPTY>
diff --git a/xmloff/dtd/table.mod b/xmloff/dtd/table.mod
index 4e11509334..4e2de20d8e 100644
--- a/xmloff/dtd/table.mod
+++ b/xmloff/dtd/table.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: table.mod,v $
- 
-  $Revision: 1.46 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT table:calculation-settings (table:null-date?, table:iteration?)>
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod
index 32d3fd5b95..8d686f3a77 100644
--- a/xmloff/dtd/text.mod
+++ b/xmloff/dtd/text.mod
@@ -1,32 +1,28 @@
 <!--
 
   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: text.mod,v $
- 
-  $Revision: 1.59 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % fields "text:date |
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index a585245431..73c09a8e79 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AttributeContainerHandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/DashStyle.hxx
index b65b34a55b..792df69b86 100644
--- a/xmloff/inc/DashStyle.hxx
+++ b/xmloff/inc/DashStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DashStyle.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 6c6f9445b4..3fd67981a5 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DomBuilderContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index ff6c7b4433..b13bc45491 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DomExport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx
index 6ea6bb0780..8da4f293b5 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeToken.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/GradientStyle.hxx
index efbe9ff83c..a8c64a6731 100644
--- a/xmloff/inc/GradientStyle.hxx
+++ b/xmloff/inc/GradientStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GradientStyle.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/HatchStyle.hxx b/xmloff/inc/HatchStyle.hxx
index 985df46161..884017ff5c 100644
--- a/xmloff/inc/HatchStyle.hxx
+++ b/xmloff/inc/HatchStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HatchStyle.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/ImageStyle.hxx b/xmloff/inc/ImageStyle.hxx
index 3427922430..8582850e6c 100644
--- a/xmloff/inc/ImageStyle.hxx
+++ b/xmloff/inc/ImageStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ImageStyle.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/MarkerStyle.hxx
index f51a7a4c96..ff05ea576d 100644
--- a/xmloff/inc/MarkerStyle.hxx
+++ b/xmloff/inc/MarkerStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MarkerStyle.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index d40cd88f91..eb37047343 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MetaExportComponent.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index 3e02c04242..27f8981c9e 100644
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MetaImportComponent.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 1795e14ef7..4b43949728 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MultiPropertySetHelper.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 63e5a3d7c3..b2209369ec 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterImportContext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index d9bab76e8b..b190c16f2c 100644
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertySetMerger.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 1578dba90c..9dd23e230e 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RDFaExportHelper.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 431bf18807..600a8a084c 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RDFaImportHelper.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 9d7ff1f9df..910b9974f8 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLExport.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 396a2ba5d2..3a57b9b20a 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLImport.hxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 79acc3d440..396787654e 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StyleMap.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index d6420a6100..541aa37e96 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransGradientStyle.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/VisAreaContext.hxx
index dc53a0ba4b..d75ff1de8b 100644
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/VisAreaContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VisAreaContext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/VisAreaExport.hxx
index 5acc5c7925..08456e23d1 100644
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/VisAreaExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VisAreaExport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index da1ffeddbc..3029a9cc3a 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBackgroundImageContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index f11a8e0730..8afc346a18 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBackgroundImageExport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index c3ae00f791..985c9c69b7 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBase64Export.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index 26b0dc16a1..87e44afcb2 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBasicExportFilter.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index 442644c19d..e4dd0c70de 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBitmapLogicalSizePropertyHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index 6c688c8377..6c13b1eb99 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBitmapRepeatOffsetPropertyHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index ed651f0add..9ef296663f 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChartPropertySetMapper.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index 412237f829..5b2c6146ca 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChartStyleContext.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index 3b8a9ce346..b89d813f9e 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLClipPropertyHandler.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 99558c9f74..1d4387b30b 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLElementPropertyContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
index 64892550cf..f16583fb55 100644
--- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEmbeddedObjectExportFilter.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index e0bf87c305..30d6eed5b4 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEmbeddedObjectImportContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 28e866f418..3667afffd9 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEventImportHelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index 0d36605d16..0965e4c1d7 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFillBitmapSizePropertyHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLFilterServiceNames.h b/xmloff/inc/XMLFilterServiceNames.h
index f626b3d1ea..eedacf41c2 100644
--- a/xmloff/inc/XMLFilterServiceNames.h
+++ b/xmloff/inc/XMLFilterServiceNames.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFilterServiceNames.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 2b1f82fa9f..1f4acb0e8b 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteConfigurationImportContext.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 6c5012e762..0663a81b6e 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLImageMapContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index 71e8db604d..f46b3a5cf5 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLImageMapExport.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 2079da6110..c90cadccbb 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBibliographyConfigurationContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index f7bbc1cf74..70eb07b9f5 100644
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIsPercentagePropertyHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 653425c077..7b87d3bdaf 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLineNumberingImportContext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 32db560c17..33ae32486c 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLNumberStylesImport.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index 9ad6451d01..ff132f7093 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLPercentOrMeasurePropertyHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index 4f8a478ee2..9c621c14a2 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLRectangleMembersHandler.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 17a49808ca..e2ce476e66 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLReplacementImageContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index df1d637f22..19cde111bf 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLScriptContextFactory.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index f24f20807c..dc49183b1e 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLScriptExportHandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index c2e5b2c606..a70035f563 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLShapePropertySetContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index bc5282b60a..413c32b5a0 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStarBasicContextFactory.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 1647c3e8ea..f15770dc24 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStarBasicExportHandler.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index 8b3a5a096b..cd03c04667 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStringBufferImportContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index c5a85b8c56..9f812bc8d0 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextColumnsContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index cc4f841935..0aca15785c 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextColumnsExport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index fddaac6b67..64e7434b03 100644
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextColumnsPropertyHandler.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 44f9277f6b..a048ec6140 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextHeaderFooterContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/XMLTextListAutoStylePool.hxx b/xmloff/inc/XMLTextListAutoStylePool.hxx
index a01a2d3c6b..13da965634 100644
--- a/xmloff/inc/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/XMLTextListAutoStylePool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextListAutoStylePool.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 422a3ae0e1..e6ea8a5bd9 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: anim.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/animationexport.hxx b/xmloff/inc/animationexport.hxx
index a0bca923f7..942b69a175 100644
--- a/xmloff/inc/animationexport.hxx
+++ b/xmloff/inc/animationexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animationexport.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index e21f974ea3..acce6bef87 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animationimport.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 120ce1235d..a30ac2be48 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animations.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 9bdd3933ff..0b2826a613 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animimp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/i18nmap.hxx b/xmloff/inc/i18nmap.hxx
index 1eb3880d5d..7250ab5e7c 100644
--- a/xmloff/inc/i18nmap.hxx
+++ b/xmloff/inc/i18nmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: i18nmap.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/makefile.mk b/xmloff/inc/makefile.mk
index 7ba6a226cc..29ffd2d5a3 100644
--- a/xmloff/inc/makefile.mk
+++ b/xmloff/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/numehelp.hxx
index 60cc27698a..3497061e58 100644
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/numehelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numehelp.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/pch/precompiled_xmloff.cxx b/xmloff/inc/pch/precompiled_xmloff.cxx
index 8f835dd247..3a50f7fcdf 100644
--- a/xmloff/inc/pch/precompiled_xmloff.cxx
+++ b/xmloff/inc/pch/precompiled_xmloff.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_xmloff.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 06ddd7bb63..b702b72fe3 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_xmloff.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index b5931bbfe4..7bea83f599 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtflde.hxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 4ced397688..cb11a4b2e8 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtfldi.hxx,v $
- * $Revision: 1.38.66.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/txtimppr.hxx
index 19cccdaf16..a2578b2bde 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/txtimppr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtimppr.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 0655c3a52c..6fe7c20443 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.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: txtlists.hxx,v $
- * $Revision: 1.2.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index cd60b237e5..6fd8a94ee7 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtvfldi.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/unoatrcn.hxx
index f409792efb..bd243b17e3 100644
--- a/xmloff/inc/unoatrcn.hxx
+++ b/xmloff/inc/unoatrcn.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoatrcn.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index f795ff9b8c..a0cf9e93ef 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xexptran.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xformsexport.hxx b/xmloff/inc/xformsexport.hxx
index 0de23b2221..4ee7ac107f 100644
--- a/xmloff/inc/xformsexport.hxx
+++ b/xmloff/inc/xformsexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xformsexport.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xformsimport.hxx b/xmloff/inc/xformsimport.hxx
index 19159ae630..8784ea55b5 100644
--- a/xmloff/inc/xformsimport.hxx
+++ b/xmloff/inc/xformsimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xformsimport.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx
index add06ae3f3..b5fac350c1 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmlcnitm.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlcnitm.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlehelp.hxx b/xmloff/inc/xmlehelp.hxx
index ed79312e68..481029784a 100644
--- a/xmloff/inc/xmlehelp.hxx
+++ b/xmloff/inc/xmlehelp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlehelp.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmlerror.hxx
index 239207ffad..1d4b8c6744 100644
--- a/xmloff/inc/xmlerror.hxx
+++ b/xmloff/inc/xmlerror.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlerror.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx
index fbc8165cfc..3f265460e6 100644
--- a/xmloff/inc/xmlkywd.hxx
+++ b/xmloff/inc/xmlkywd.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlkywd.hxx,v $
- * $Revision: 1.176 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmlnmspe.hxx
index c2447dd7b6..be04ae1a14 100644
--- a/xmloff/inc/xmlnmspe.hxx
+++ b/xmloff/inc/xmlnmspe.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnmspe.hxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
index 59b94867ca..249d5c39ba 100644
--- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx
+++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocumentSettingsContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/xmloff/inc/xmloff/EnumPropertyHdl.hxx
index 14b44518df..a83c84ccfd 100644
--- a/xmloff/inc/xmloff/EnumPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/EnumPropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnumPropertyHdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
index 1422bcdbbb..e5ab99a23d 100644
--- a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NamedBoolPropertyHdl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
index b73fb88b83..1c43f4d8be 100644
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterStyleMap.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index cb1ae3ab54..40298fb761 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProgressBarHelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/PropertySetInfoHash.hxx b/xmloff/inc/xmloff/PropertySetInfoHash.hxx
index bd4a7e2185..7c2ffd38c2 100644
--- a/xmloff/inc/xmloff/PropertySetInfoHash.hxx
+++ b/xmloff/inc/xmloff/PropertySetInfoHash.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertySetInfoHash.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/PropertySetInfoKey.hxx b/xmloff/inc/xmloff/PropertySetInfoKey.hxx
index 9e37e37898..0467a55d64 100644
--- a/xmloff/inc/xmloff/PropertySetInfoKey.hxx
+++ b/xmloff/inc/xmloff/PropertySetInfoKey.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertySetInfoKey.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
index 37b7af0840..5308daa2a6 100644
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLExportHelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index e89c1d667e..2c38eb6443 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLImportHelper.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/xmloff/inc/xmloff/SettingsExportHelper.hxx
index 5e0514aa2d..9931620e2b 100644
--- a/xmloff/inc/xmloff/SettingsExportHelper.hxx
+++ b/xmloff/inc/xmloff/SettingsExportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SettingsExportHelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
index d46fd0c594..0d26a6a6ed 100644
--- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
+++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SinglePropertySetInfoCache.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
index a9c4d3476d..c59e5cdcad 100644
--- a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WordWrapPropertyHdl.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
index 67340b0155..3e787aa6b7 100644
--- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBase64ImportContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/xmloff/inc/xmloff/XMLCharContext.hxx
index dd1238b896..a649f88b77 100644
--- a/xmloff/inc/xmloff/XMLCharContext.hxx
+++ b/xmloff/inc/xmloff/XMLCharContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLCharContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
index de4dec8fa8..5b9ae140aa 100644
--- a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLConstantsPropertyHandler.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/xmloff/inc/xmloff/XMLEventExport.hxx
index 260d44f848..e7d2a45aff 100644
--- a/xmloff/inc/xmloff/XMLEventExport.hxx
+++ b/xmloff/inc/xmloff/XMLEventExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEventExport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/xmloff/inc/xmloff/XMLEventsImportContext.hxx
index 207a6fd0ef..660eb9d535 100644
--- a/xmloff/inc/xmloff/XMLEventsImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLEventsImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEventsImportContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
index dc252d5efd..bf4299b702 100644
--- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFontAutoStylePool.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index 9ac595b5f7..c5ef294b38 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFontStylesContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
index 1897344c68..83eb71049d 100644
--- a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLGraphicsDefaultStyle.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx
index 2a4302882d..f61d0c8af7 100644
--- a/xmloff/inc/xmloff/XMLPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLPageExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLPageExport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
index 6bd96b3991..ea714ba258 100644
--- a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
+++ b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLShapeStyleContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/xmloff/inc/xmloff/XMLStringVector.hxx
index dd94fe9eef..1c193ce7b5 100644
--- a/xmloff/inc/xmloff/XMLStringVector.hxx
+++ b/xmloff/inc/xmloff/XMLStringVector.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStringVector.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
index f93251e090..5a20c6790f 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMasterPageContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
index f40cc7625c..6c56cb2a5d 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMasterPageExport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
index d5f82defd1..4b6f622aae 100644
--- a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMasterStylesContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
index 4aeb0e8f8f..ce4ccbcc7b 100644
--- a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextShapeStyleContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/xmloff/inc/xmloff/XMLTextTableContext.hxx
index 36036e4b9b..e3d7e77087 100644
--- a/xmloff/inc/xmloff/XMLTextTableContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextTableContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextTableContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/animexp.hxx b/xmloff/inc/xmloff/animexp.hxx
index ec8a50efed..6bc1c495ab 100644
--- a/xmloff/inc/xmloff/animexp.hxx
+++ b/xmloff/inc/xmloff/animexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animexp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/attrlist.hxx b/xmloff/inc/xmloff/attrlist.hxx
index 6510eb2bf6..b731543ce9 100644
--- a/xmloff/inc/xmloff/attrlist.hxx
+++ b/xmloff/inc/xmloff/attrlist.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attrlist.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/contextid.hxx b/xmloff/inc/xmloff/contextid.hxx
index d0681895fa..70afb5a4c8 100644
--- a/xmloff/inc/xmloff/contextid.hxx
+++ b/xmloff/inc/xmloff/contextid.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contextid.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx
index 971d25090f..08bbe75417 100644
--- a/xmloff/inc/xmloff/controlpropertyhdl.hxx
+++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlpropertyhdl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/dllapi.h b/xmloff/inc/xmloff/dllapi.h
index 1489396760..e1802baf64 100644
--- a/xmloff/inc/xmloff/dllapi.h
+++ b/xmloff/inc/xmloff/dllapi.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: dllapi.h,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/families.hxx b/xmloff/inc/xmloff/families.hxx
index a9662fb7f9..647facf368 100644
--- a/xmloff/inc/xmloff/families.hxx
+++ b/xmloff/inc/xmloff/families.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: families.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/xmloff/inc/xmloff/formlayerexport.hxx
index 3606c2143f..8064f56a27 100644
--- a/xmloff/inc/xmloff/formlayerexport.hxx
+++ b/xmloff/inc/xmloff/formlayerexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formlayerexport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/xmloff/inc/xmloff/formlayerimport.hxx
index d21241accf..0bc98700d4 100644
--- a/xmloff/inc/xmloff/formlayerimport.hxx
+++ b/xmloff/inc/xmloff/formlayerimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formlayerimport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/formsimp.hxx b/xmloff/inc/xmloff/formsimp.hxx
index d015b6191c..9069996769 100644
--- a/xmloff/inc/xmloff/formsimp.hxx
+++ b/xmloff/inc/xmloff/formsimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formsimp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx
index 2e756692ff..b3bb65e33f 100644
--- a/xmloff/inc/xmloff/maptype.hxx
+++ b/xmloff/inc/xmloff/maptype.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: maptype.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index 9c221bc200..bd7d664f48 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nmspmap.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/xmloff/inc/xmloff/prhdlfac.hxx
index 590b550e0a..a2d7c0ea84 100644
--- a/xmloff/inc/xmloff/prhdlfac.hxx
+++ b/xmloff/inc/xmloff/prhdlfac.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prhdlfac.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx
index 61dcfdcceb..ef19cfabd7 100644
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/xmloff/inc/xmloff/prstylei.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prstylei.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx
index f4f79c117c..dd5eb2ac75 100644
--- a/xmloff/inc/xmloff/shapeexport.hxx
+++ b/xmloff/inc/xmloff/shapeexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeexport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index cae039cc62..7b210fcbaf 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeimport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index 6e53b3b87a..8adacab37f 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: styleexp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/xmloff/inc/xmloff/table/XMLTableExport.hxx
index 041c96d194..ac5a28ea65 100644
--- a/xmloff/inc/xmloff/table/XMLTableExport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTableExport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx
index ee3f461739..10930cb927 100644
--- a/xmloff/inc/xmloff/table/XMLTableImport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTableImport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 381973917d..96e2cafc32 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.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: txtimp.hxx,v $
- * $Revision: 1.13.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index e82923d90b..e31d696396 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.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: txtparae.hxx,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/xmloff/inc/xmloff/txtprmap.hxx b/xmloff/inc/xmloff/txtprmap.hxx
index c1dbb2bba1..07b9408957 100644
--- a/xmloff/inc/xmloff/txtprmap.hxx
+++ b/xmloff/inc/xmloff/txtprmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtprmap.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/txtstyle.hxx b/xmloff/inc/xmloff/txtstyle.hxx
index d2388e655c..386ca539eb 100644
--- a/xmloff/inc/xmloff/txtstyle.hxx
+++ b/xmloff/inc/xmloff/txtstyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtstyle.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx
index 6d97d76f62..1f37536b2a 100644
--- a/xmloff/inc/xmloff/txtstyli.hxx
+++ b/xmloff/inc/xmloff/txtstyli.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtstyli.hxx,v $
- * $Revision: 1.3.102.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/uniref.hxx b/xmloff/inc/xmloff/uniref.hxx
index a6e1e6895f..fbbe97caa4 100644
--- a/xmloff/inc/xmloff/uniref.hxx
+++ b/xmloff/inc/xmloff/uniref.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uniref.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx
index 36bb8e8b58..8aed493db1 100644
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/xmloff/inc/xmloff/xmlaustp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlaustp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index b7306d5158..855d53128e 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlcnimp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlement.hxx b/xmloff/inc/xmloff/xmlement.hxx
index c783f99cf2..daa5d56b7a 100644
--- a/xmloff/inc/xmloff/xmlement.hxx
+++ b/xmloff/inc/xmloff/xmlement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlement.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlevent.hxx b/xmloff/inc/xmloff/xmlevent.hxx
index aa47a20fe7..2450a36ead 100644
--- a/xmloff/inc/xmloff/xmlevent.hxx
+++ b/xmloff/inc/xmloff/xmlevent.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlevent.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index 37d81a72a9..01b5ad0691 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.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: xmlexp.hxx,v $
- * $Revision: 1.11.48.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx
index a1b935de40..66cd5c1aa2 100644
--- a/xmloff/inc/xmloff/xmlexppr.hxx
+++ b/xmloff/inc/xmloff/xmlexppr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlexppr.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx
index 14ac38489e..9eedec23f0 100644
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/xmloff/inc/xmloff/xmlictxt.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlictxt.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 93b32254f8..e0c29b1b86 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlimp.hxx,v $
- * $Revision: 1.12.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 243c050117..c3bffdc244 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlimppr.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/xmloff/inc/xmloff/xmlmetae.hxx
index 6715456ea2..ccc000e4fe 100644
--- a/xmloff/inc/xmloff/xmlmetae.hxx
+++ b/xmloff/inc/xmloff/xmlmetae.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmetae.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx
index d525c74636..6343c4ee37 100644
--- a/xmloff/inc/xmloff/xmlmetai.hxx
+++ b/xmloff/inc/xmloff/xmlmetai.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmetai.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index b69548595e..ccabbf5d87 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.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: xmlnume.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/xmloff/inc/xmloff/xmlnumfe.hxx
index 1c424b3733..73bc3f4d6d 100644
--- a/xmloff/inc/xmloff/xmlnumfe.hxx
+++ b/xmloff/inc/xmloff/xmlnumfe.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnumfe.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index f30023905e..b33f2d4a2a 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnumfi.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/xmloff/inc/xmloff/xmlnumi.hxx
index acc9784837..99136a5772 100644
--- a/xmloff/inc/xmloff/xmlnumi.hxx
+++ b/xmloff/inc/xmloff/xmlnumi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnumi.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx
index 9a8f4bd359..00e4a032e3 100644
--- a/xmloff/inc/xmloff/xmlprcon.hxx
+++ b/xmloff/inc/xmloff/xmlprcon.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlprcon.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/xmloff/inc/xmloff/xmlprhdl.hxx
index 888fe614d6..40c51bfaf0 100644
--- a/xmloff/inc/xmloff/xmlprhdl.hxx
+++ b/xmloff/inc/xmloff/xmlprhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlprhdl.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx
index 10730effc0..9883ebf457 100644
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/xmloff/inc/xmloff/xmlprmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlprmap.hxx,v $
- * $Revision: 1.4.74.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/xmloff/inc/xmloff/xmlscripti.hxx
index 2d20e14494..561dda0f04 100644
--- a/xmloff/inc/xmloff/xmlscripti.hxx
+++ b/xmloff/inc/xmloff/xmlscripti.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlscripti.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index e55a6d7e24..60e2e8e4b0 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlstyle.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmltkmap.hxx b/xmloff/inc/xmloff/xmltkmap.hxx
index 1055439ddb..afbba184f5 100644
--- a/xmloff/inc/xmloff/xmltkmap.hxx
+++ b/xmloff/inc/xmloff/xmltkmap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltkmap.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index daca654692..6e4c45eb4a 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.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: xmltoken.hxx,v $
- * $Revision: 1.27.6.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx
index cd3e443563..b337698ccf 100644
--- a/xmloff/inc/xmloff/xmltypes.hxx
+++ b/xmloff/inc/xmloff/xmltypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltypes.hxx,v $
- * $Revision: 1.6.36.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 8f700ab824..5ec91a1080 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmluconv.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmlreg.hxx
index 5606c74021..65001ee57e 100644
--- a/xmloff/inc/xmlreg.hxx
+++ b/xmloff/inc/xmlreg.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlreg.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmltabe.hxx
index c26b75b445..0c28b98f31 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmltabe.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltabe.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index f69fc535b7..f7015e66af 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltabi.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 0a4950d96a..6f5194dc6a 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlversion.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/qa/unoapi/makefile.mk b/xmloff/qa/unoapi/makefile.mk
index 61d01403a1..0f0cc8c799 100644
--- a/xmloff/qa/unoapi/makefile.mk
+++ b/xmloff/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 6dd0338378..e65f00ef13 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ColorPropertySet.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index 6a869c2baf..32d11182c3 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ColorPropertySet.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index 377db18d2d..f9efd029eb 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MultiPropertySetHandler.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index f801d630fe..5b1537cd7e 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyMap.hxx,v $
- * $Revision: 1.34.8.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 12f3e74b2f..af586677ea 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyMaps.cxx,v $
- * $Revision: 1.56.40.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 14474db43f..bcc78de8d3 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLAutoStylePoolP.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index 5e026ef91c..d34e034b06 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLAutoStylePoolP.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index c59aab85f1..c99abb495b 100755..100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLCalculationSettingsContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index 3590516235..c0410e51cd 100755..100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLCalculationSettingsContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 5125a37610..30e85d60c5 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLChartContext.cxx,v $
- * $Revision: 1.43 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 076cde7340..cbd7b67ed0 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLChartContext.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 56daa7b05c..2bf08b861a 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLExport.cxx,v $
- * $Revision: 1.101 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 9a8779630c..ea96017d37 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLImport.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 45f29e5325..aa26e6d0e8 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLParagraphContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index 5cb0904cea..938e5adeac 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLParagraphContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 3d8a8495f4..917a2f99b4 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLPlotAreaContext.cxx,v $
- * $Revision: 1.47.38.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 9ec09f3f07..35618f34e5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLPlotAreaContext.hxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 82a8973408..33ff893423 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLSeries2Context.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index cb5a841974..faa42b2809 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLSeries2Context.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 5cae51aa99..a7518a6cba 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLSeriesHelper.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx
index 6c8a458edf..b77f4fba27 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.hxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLSeriesHelper.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 2e0aad2997..3aeef56cbf 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLTableContext.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index a49c70b8a8..3ff4a2a55b 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLTableContext.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 6a600a44e1..9411d013bc 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLTools.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -745,14 +742,14 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
         uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY );
         if( xChild.is() )
         {
-            aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) );

+            aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) );
             if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project") ) ) != -1 )
             {
-                //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) 

-                //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream

-                if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 )

-                    bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer

-                else

+                //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) 
+                //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream
+                if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 )
+                    bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer
+                else
                     bResult= true; //in this case the OLE chart was created by an older version, as OLE objects are sometimes stream copied the version can differ from the parents version, so the parents version is not a reliable indicator
             }
             else if( isDocumentGeneratedWithOpenOfficeOlderThan2_0(xChartModel) )
@@ -762,18 +759,18 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
     return bResult;
 }
 
-bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel)

-{

-    bool bResult = false;

-    ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );

-    if(    ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 )

-        )

-        bResult= true;

-    return bResult;

+bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel)
+{
+    bool bResult = false;
+    ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );
+    if(    ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 )
+        )
+        bResult= true;
+    return bResult;
 }
 
 Reference< chart2::data::XDataProvider > getDataProviderFromParent( const Reference< chart2::XChartDocument >& xChartDoc )
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 8be5df2ddb..298288dbb4 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchXMLTools.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
index 85687b6081..3b16ca2939 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAxisPositionPropertyHdl.cxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
index 45a61df894..dc68dcaff3 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAxisPositionPropertyHdl.hxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index d81ebb2b1f..9cbaa5b7be 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChartPropertyContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx
index 7562c6c7a3..5fccb7d711 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.hxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChartPropertyContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index c234c0e181..87adea123a 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChartStyleContext.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index 71652e4a7f..ef8e573fdc 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLErrorBarStylePropertyHdl.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
index 7edcd4cfcb..46518de3a2 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLErrorBarStylePropertyHdl.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index af5dcaa083..0cdc38f10a 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLErrorIndicatorPropertyHdl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
index 4a643b4c6d..50cbe69a8b 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLErrorIndicatorPropertyHdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 804bb96cc8..56c1ec5d4d 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLabelSeparatorContext.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index 3b94c1c719..e54bed2be5 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLabelSeparatorContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index ee16507fc4..99ce619be4 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSymbolImageContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index fcfce9b514..71853c9dbd 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSymbolImageContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
index cf2f6598fe..b476a09454 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSymbolTypePropertyHdl.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index e3b6a37853..51e814d8dc 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSymbolTypePropertyHdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx
index b2cf377b66..706cf50441 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.cxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextOrientationHdl.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx
index d49431b96a..e685113e72 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.hxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextOrientationHdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 48cdf9a683..65c1e15f7d 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contexts.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index 1433049966..54a8cf884c 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: contexts.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
index 5b47b77702..d129a15d13 100644
--- a/xmloff/source/chart/makefile.mk
+++ b/xmloff/source/chart/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.15 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/chart/transporttypes.cxx b/xmloff/source/chart/transporttypes.cxx
index 3c48d4598e..c0a1e65e0e 100644
--- a/xmloff/source/chart/transporttypes.cxx
+++ b/xmloff/source/chart/transporttypes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transporttypes.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 90e8b48333..2fb5779e93 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: transporttypes.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index a2077a00ce..34735adb57 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocumentSettingsContext.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index d086580c2a..db9615c70f 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DomBuilderContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index ff512474c8..3f70ea4f53 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DomExport.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 94c8e2dc74..e92d615666 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProgressBarHelper.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 9066737c81..56fa7ac049 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertySetMerger.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index e803c7dc1c..6e3129f48d 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RDFaExportHelper.cxx,v $
- * $Revision: 1.1.2.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 2846042177..4dbf840fd3 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RDFaImportHelper.cxx,v $
- * $Revision: 1.1.2.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 33db74dd13..bddfdb15d3 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SettingsExportHelper.cxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index cae9b456d1..9e76298f59 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBase64Export.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index c744d7fee1..3cb2c422ca 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBase64ImportContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx
index 4e0190c129..618f38ab86 100644
--- a/xmloff/source/core/XMLBasicExportFilter.cxx
+++ b/xmloff/source/core/XMLBasicExportFilter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBasicExportFilter.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index a9a189382d..03b52828d5 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEmbeddedObjectExportFilter.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 1b44a8cfe5..864b880809 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEmbeddedObjectImportContext.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 86de77e4e9..161000dbca 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attrlist.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index f39d2b8f47..c4ced34a7a 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: facreg.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 5f5d1a60c0..d32eef0bb0 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: i18nmap.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
index b9cb8e9c1b..05b5c6068f 100644
--- a/xmloff/source/core/makefile.mk
+++ b/xmloff/source/core/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.28 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index e33a2ae108..cf0192cca9 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: nmspmap.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -199,12 +196,12 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
     if (aIter != aNameMap.end())
     {
         sAttrName.append( sXMLNS  );
-        const ::rtl::OUString & prefix( (*aIter).second->sPrefix );

-        if (prefix.getLength()) // not default namespace

-        {

-            sAttrName.append( sal_Unicode(':') );

-            sAttrName.append( prefix );

-        }

+        const ::rtl::OUString & prefix( (*aIter).second->sPrefix );
+        if (prefix.getLength()) // not default namespace
+        {
+            sAttrName.append( sal_Unicode(':') );
+            sAttrName.append( prefix );
+        }
     }
     return sAttrName.makeStringAndClear();
 }
@@ -229,11 +226,11 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
             // don't bother caching this, it rarely happens
             OUStringBuffer sQName;
             sQName.append ( sXMLNS );
-            if (rLocalName.getLength()) // not default namespace

-            {

-                sQName.append ( sal_Unicode(':') );

-                sQName.append ( rLocalName );

-            }

+            if (rLocalName.getLength()) // not default namespace
+            {
+                sQName.append ( sal_Unicode(':') );
+                sQName.append ( rLocalName );
+            }
             return sQName.makeStringAndClear();;
         }
         case XML_NAMESPACE_XML:
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 1ae7ed7ab3..c8e6e8fba9 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoatrcn.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index b372fc70b7..06c2cdd96b 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unointerfacetouniqueidentifiermapper.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index d7d3035bc9..bde6c00bd8 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlcnitm.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx
index aabd4b21f0..7642137de5 100644
--- a/xmloff/source/core/xmlehelp.cxx
+++ b/xmloff/source/core/xmlehelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlehelp.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlenums.hxx b/xmloff/source/core/xmlenums.hxx
index 9c0ac650e4..9d08d3ba17 100644
--- a/xmloff/source/core/xmlenums.hxx
+++ b/xmloff/source/core/xmlenums.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlenums.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index d1f5bf5632..10c73ae5d0 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlerror.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 37e74b4caf..a2ce4eb446 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.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: xmlexp.cxx,v $
- * $Revision: 1.143 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index d7fe067fe8..ebe98e9c0f 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlictxt.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 9807e7982b..91480f1fcf 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlimp.cxx,v $
- * $Revision: 1.112.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmlkywd.cxx b/xmloff/source/core/xmlkywd.cxx
index 644bbc4457..87ce105d45 100644
--- a/xmloff/source/core/xmlkywd.cxx
+++ b/xmloff/source/core/xmlkywd.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlkywd.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 9463dea06c..a063698374 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltkmap.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 0a2ccd57d1..bb4370a8dc 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.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: xmltoken.cxx,v $
- * $Revision: 1.131.6.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 968cf5c6d2..c458ff4042 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmluconv.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 8b854fe860..d60ea5805e 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnhancedCustomShapeToken.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 284737ff73..2ccb7ad114 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLGraphicsDefaultStyle.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 1066e37766..2dfecec429 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLImageMapContext.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 297531c613..147a4810ab 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLImageMapExport.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 34b89764fd..5e0ccb2c9e 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLNumberStyles.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx
index 6ff63eee65..873b866318 100644
--- a/xmloff/source/draw/XMLNumberStylesExport.hxx
+++ b/xmloff/source/draw/XMLNumberStylesExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLNumberStylesExport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 609c5441b8..738030cd72 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLReplacementImageContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index db45f63020..a214724582 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLShapePropertySetContext.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 395817015c..e701dfd85a 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLShapeStyleContext.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index fcb7384113..a9b06e733b 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animationexport.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index b3f3e07771..1fbdae102a 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animationimport.cxx,v $
- * $Revision: 1.15.62.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index a374770a8a..df335a0337 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animexp.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index e3cbe88163..7d74399bf8 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: animimp.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index b6770014ea..371cafe30d 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: descriptionimp.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index f82db52121..711aaf902a 100644
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: descriptionimp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 5efceb59a3..fdf75aa254 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventimp.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index fa8fa9c3ad..9a3f4e5c20 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventimp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index 8755ba272d..341e9cf552 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerexp.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/layerexp.hxx b/xmloff/source/draw/layerexp.hxx
index e2193a8704..6af5fdf9b2 100644
--- a/xmloff/source/draw/layerexp.hxx
+++ b/xmloff/source/draw/layerexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerexp.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index cf737b2080..2e8fcaf9a6 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerimp.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index 7da547c1a8..13f2f965b7 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerimp.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk
index a0bd30cad1..2181b0edf0 100644
--- a/xmloff/source/draw/makefile.mk
+++ b/xmloff/source/draw/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.24 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index 1149b1e6fd..f05f6d979d 100644
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numithdl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx
index a8eb311cda..beddb24b6d 100644
--- a/xmloff/source/draw/numithdl.hxx
+++ b/xmloff/source/draw/numithdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numithdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 5ad2b1ba98..955b7091ad 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propimp0.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index e3bbc3d21c..c563777613 100644
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propimp0.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index fb440dc11e..6fbcb8b9dd 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdpropls.cxx,v $
- * $Revision: 1.102 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 569340c8c3..4fe126b337 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdpropls.hxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index f75107c6e2..627f7ffa0a 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdxmlexp.cxx,v $
- * $Revision: 1.119 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -1263,51 +1260,51 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
                         break;
                     }
 
-                    case 33 : // AUTOLAYOUT_4CLIPART

-                    {

-                        Rectangle aTopLeft(pInfo->GetPresRectangle());

-                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

-                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));

-                        Rectangle aBottomLeft(aTopLeft);

-                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);

-                        Rectangle aTopRight(aTopLeft);

-                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);

-                        Rectangle aBottomRight(aTopRight);

-                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);

-

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);

-                        break;

-                    }

-
-                    case 34 : // AUTOLAYOUT_6CLIPART

-                    {

-                        Rectangle aTopLeft(pInfo->GetPresRectangle());

-                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

-                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));	

-                        Rectangle aTopCenter(aTopLeft);

-                        aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);

-                        Rectangle aTopRight(aTopLeft);

-                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);

-                    

-                        Rectangle aBottomLeft(aTopLeft);

-                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);

-                        Rectangle aBottomCenter(aTopCenter);

-                        aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);

-                        Rectangle aBottomRight(aTopRight);

-                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);

-                                                

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);

-                        break;

+                    case 33 : // AUTOLAYOUT_4CLIPART
+                    {
+                        Rectangle aTopLeft(pInfo->GetPresRectangle());
+                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
+                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
+                        Rectangle aBottomLeft(aTopLeft);
+                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+                        Rectangle aTopRight(aTopLeft);
+                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
+                        Rectangle aBottomRight(aTopRight);
+                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
+                        break;
+                    }
+
+                    case 34 : // AUTOLAYOUT_6CLIPART
+                    {
+                        Rectangle aTopLeft(pInfo->GetPresRectangle());
+                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
+                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));	
+                        Rectangle aTopCenter(aTopLeft);
+                        aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);
+                        Rectangle aTopRight(aTopLeft);
+                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);
+                    
+                        Rectangle aBottomLeft(aTopLeft);
+                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+                        Rectangle aBottomCenter(aTopCenter);
+                        aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);
+                        Rectangle aBottomRight(aTopRight);
+                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+                                                
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
+                        break;
                     }
                     default:
                     {
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index c5d92fcd05..894fcb7521 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdxmlexp_impl.hxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 538dd65384..fddf549638 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdxmlimp.cxx,v $
- * $Revision: 1.58 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 3cf1468ba2..23820b3eb4 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: sdxmlimp_impl.hxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index b39d29e664..f2c14b7f9d 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeexport.cxx,v $
- * $Revision: 1.81 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index af04a6e533..cefcd03f71 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeexport2.cxx,v $
- * $Revision: 1.66 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index a6bf644c29..6c6601351e 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeexport3.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index a8587489d5..391d1269a9 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeexport4.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index e30a96065b..c7a9da04ca 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shapeimport.cxx,v $
- * $Revision: 1.68 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index f8e057d53b..0953cb7536 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
index 7617989234..56e6be33bf 100644
--- a/xmloff/source/draw/viewcontext.hxx
+++ b/xmloff/source/draw/viewcontext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: viewcontext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 67fb651b5b..ff94f56e0d 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xexptran.cxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 878f9bcf6e..24ddd1981c 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximp3dobject.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 8b7f7a76ac..8b54bea143 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximp3dobject.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 7330904a1f..b907c70f10 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximp3dscene.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 117cd71f3a..7f787eb048 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximp3dscene.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 71aa82da49..ab7cda5dc4 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpbody.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index c807cec1c8..962d0ce181 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpbody.hxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index d491b1bab6..1f4e1ecef2 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpcustomshape.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 0dc710d1ea..8cb7428381 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpcustomshape.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 89e2a4e3a6..739411c96c 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpgrp.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index bbcdda70d9..91390c43e2 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpgrp.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 04d7ec3d9e..53364fab5d 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximplink.cxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 249b2f81ab..cb4d0c7682 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximplink.hxx,v $
- * $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 729fcc26fa..6b01bc8f4f 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpnote.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index ed12d68c97..1e76e46e98 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpnote.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 1008691682..90fa721900 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximppage.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 21c6992098..aaa6e28be6 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximppage.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 6b6aedbfa9..7dbdd98e05 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpshap.cxx,v $
- * $Revision: 1.128.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 65616bfdf2..9c0424b3aa 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpshap.hxx,v $
- * $Revision: 1.48.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index 3bea281dcf..39a1054d12 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpshow.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index 4501fa9c0d..daab65be1b 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpshow.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index e47b144ff7..d0f589b9b0 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpstyl.cxx,v $
- * $Revision: 1.53 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
@@ -732,24 +729,24 @@ void SdXMLPresentationPageLayoutContext::EndElement()
                 }
                 case 5:
                 {
-                    SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);

-

-                    if(pObj1->GetName().equals(

-                        OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))

-                    {

-                        mnTypeId = 18; // AUTOLAYOUT_4OBJ

-                    }

-                    else

-                    {

-                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART

-                    }

-                     break;

+                    SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
+
+                    if(pObj1->GetName().equals(
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))
+                    {
+                        mnTypeId = 18; // AUTOLAYOUT_4OBJ
+                    }
+                    else
+                    {
+                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART
+                    }
+                     break;
 
                 }
                 case 7: 
                 {
-                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART

-                    break;

+                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART
+                    break;
                 }
                 default:
                 {
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 146d91c986..314c46346d 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ximpstyl.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index bff92c7cbe..aed597c728 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attriblistmerge.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 43c905dc8c..98bec69e6d 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: attriblistmerge.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index 5fa8b853c0..b657320868 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: callbacks.hxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx
index 05fcbb8bdf..ff2145184b 100644
--- a/xmloff/source/forms/controlelement.cxx
+++ b/xmloff/source/forms/controlelement.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlelement.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx
index 0bf57063b0..1c02117edd 100644
--- a/xmloff/source/forms/controlelement.hxx
+++ b/xmloff/source/forms/controlelement.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlelement.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index 390e50a105..a743ab26c1 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlpropertyhdl.cxx,v $
- * $Revision: 1.22 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index a40421864c..214d3f4606 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlpropertymap.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index d6302c74f5..07699d5198 100644
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: controlpropertymap.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 8b6abaf992..2e7ad415b9 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementexport.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index c2d5fde52a..1135d4117d 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementexport.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index e25eef33db..5623493791 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementimport.cxx,v $
- * $Revision: 1.60.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index ce6540cd69..427b80d27e 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementimport.hxx,v $
- * $Revision: 1.31 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx
index 49bd8d8f7f..d110d7df8b 100644
--- a/xmloff/source/forms/elementimport_impl.hxx
+++ b/xmloff/source/forms/elementimport_impl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: elementimport_impl.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 45a679bd40..b6faded7ff 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventexport.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index fcb0029e36..6ee84502b1 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventexport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index 1556dd6ac6..d727133c23 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventimport.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index 2e58fa73e5..f627593620 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: eventimport.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 75a44b1ffe..b663f05d3c 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formattributes.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index fcadbecd3c..0f28ec577f 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formattributes.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index 0f3e657e16..95284d61f6 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formcellbinding.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index 4053b07f50..18df52ed2a 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formcellbinding.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index 90efb4b39c..5f15f47460 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formenums.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx
index 2d798bcf6e..ac11cbcaf1 100644
--- a/xmloff/source/forms/formenums.hxx
+++ b/xmloff/source/forms/formenums.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formenums.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index 2d83b9bc5c..206d80b496 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formevents.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx
index 018867076d..f0390057b6 100644
--- a/xmloff/source/forms/formevents.hxx
+++ b/xmloff/source/forms/formevents.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formevents.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 867624fbaa..16f3c45806 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formlayerexport.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 0c903a4204..55a87126b6 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formlayerimport.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index 42acd6d339..00a7456607 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formsimp.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formstyles.cxx b/xmloff/source/forms/formstyles.cxx
index c0e7aba282..cfe4a72a18 100644
--- a/xmloff/source/forms/formstyles.cxx
+++ b/xmloff/source/forms/formstyles.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formstyles.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/formstyles.hxx b/xmloff/source/forms/formstyles.hxx
index 5ac5a89baf..4c9ba15c4d 100644
--- a/xmloff/source/forms/formstyles.hxx
+++ b/xmloff/source/forms/formstyles.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: formstyles.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index d5e647f4b2..3eb6127419 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridcolumnproptranslator.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 51c52c59fa..eb619769ea 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: gridcolumnproptranslator.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx
index dcf532b7d3..e8624e6f80 100644
--- a/xmloff/source/forms/ifacecompare.hxx
+++ b/xmloff/source/forms/ifacecompare.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ifacecompare.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index eb8c56b610..11bcd87bcf 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerexport.cxx,v $
- * $Revision: 1.36.102.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 6d3a318bfd..8f66125374 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerexport.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 7c8a7152f7..74fe525a8f 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerimport.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index ad11880beb..97f5f16e5d 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: layerimport.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx
index 438fa55cca..ab940d7ac0 100644
--- a/xmloff/source/forms/logging.cxx
+++ b/xmloff/source/forms/logging.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logging.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx
index f75a4e53d2..f99cc815e7 100644
--- a/xmloff/source/forms/logging.hxx
+++ b/xmloff/source/forms/logging.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: logging.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
index facc6b9810..c39b4fe156 100644
--- a/xmloff/source/forms/makefile.mk
+++ b/xmloff/source/forms/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.24 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 0a65cbafe4..e077477356 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: officeforms.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 9fde6e1568..f8dcf77c35 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: officeforms.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 5a265d4ac6..e8328e6b2f 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyexport.cxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 0934d9b642..b0b4f83ba0 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyexport.hxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 3d88b29271..efb1f0167c 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyimport.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 2306bd80bd..084d44f9fd 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: propertyimport.hxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/strings.cxx b/xmloff/source/forms/strings.cxx
index a99a422a0f..3398621225 100644
--- a/xmloff/source/forms/strings.cxx
+++ b/xmloff/source/forms/strings.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strings.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/strings.hxx b/xmloff/source/forms/strings.hxx
index 57bf81f620..bcaf0abfcb 100644
--- a/xmloff/source/forms/strings.hxx
+++ b/xmloff/source/forms/strings.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: strings.hxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx
index f3633132f0..add4cbc28c 100644
--- a/xmloff/source/forms/valueproperties.cxx
+++ b/xmloff/source/forms/valueproperties.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valueproperties.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx
index 4d88a9d90c..0bd66f5367 100644
--- a/xmloff/source/forms/valueproperties.hxx
+++ b/xmloff/source/forms/valueproperties.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: valueproperties.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 9ad2b841cf..9f49c9dcc1 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MetaExportComponent.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index f371054f6f..b61e8d1130 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MetaImportComponent.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk
index 3e6ca575da..10abd6d7f3 100644
--- a/xmloff/source/meta/makefile.mk
+++ b/xmloff/source/meta/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index fb2893201f..8aa0a40548 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmetae.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 26a96378a1..35dab51021 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmetai.cxx,v $
- * $Revision: 1.32 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index a3d370db30..e368087db3 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlversion.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index cf4b66225c..d0ee9059be 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEventExport.cxx,v $
- * $Revision: 1.21.86.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index d1697d92a9..58f7c90ebf 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEventImportHelper.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index b1881b609f..7aecf89442 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLEventsImportContext.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 58928e3be7..a9debc70d9 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLScriptContextFactory.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index 92e4e70cd7..d878d7cde3 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLScriptExportHandler.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 26eb08813a..9afd5ba8a9 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStarBasicContextFactory.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 863db4fc34..b43b698a3f 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStarBasicExportHandler.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk
index e4ce555e9b..663f281dfb 100644
--- a/xmloff/source/script/makefile.mk
+++ b/xmloff/source/script/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx
index babc0a35c7..8f7e4cf6dd 100644
--- a/xmloff/source/script/xmlbasici.cxx
+++ b/xmloff/source/script/xmlbasici.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbasici.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index 2263326dcf..b7961c4025 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbasici.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index 96dbd6cf39..a29c5ae4c5 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlscripti.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx
index 864ddd28f0..cc542b2567 100644
--- a/xmloff/source/style/AttributeContainerHandler.cxx
+++ b/xmloff/source/style/AttributeContainerHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AttributeContainerHandler.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 072f6c3f4e..4713d78c9a 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DashStyle.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx
index 8874cb9853..bcf314de58 100644
--- a/xmloff/source/style/DrawAspectHdl.cxx
+++ b/xmloff/source/style/DrawAspectHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DrawAspectHdl.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx
index 53b0beea69..5dbe696249 100644
--- a/xmloff/source/style/DrawAspectHdl.hxx
+++ b/xmloff/source/style/DrawAspectHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DrawAspectHdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index aef435ada0..974bc2b598 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EnumPropertyHdl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 55556433d4..0a0086c1b0 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FillStyleContext.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 9ed0c0b50b..680d93f90c 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FillStyleContext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index ac8dff99e3..1b1ce0873f 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: GradientStyle.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index a7d1c97871..2c0c780bb5 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: HatchStyle.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index c53ce82061..29c2b7f0c1 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ImageStyle.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 86c78cbd6a..bf451ffbf7 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MarkerStyle.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index bf856604df..4c849bb937 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MultiPropertySetHelper.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx
index cd82542be3..1402630ec3 100644
--- a/xmloff/source/style/NamedBoolPropertyHdl.cxx
+++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NamedBoolPropertyHdl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index dd4aa73b00..571c001d00 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageHeaderFooterContext.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index 5775db0b13..a5b5724d31 100644
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageHeaderFooterContext.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 5f3da2af10..23e59e7013 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterExportPropMapper.cxx,v $
- * $Revision: 1.23 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index da01d32757..9a9868ed9d 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterExportPropMapper.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 1f26064a4a..d0efed34a6 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterImportContext.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index ca71aa71ec..50616913e4 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterImportPropMapper.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx
index fa1aeb1a4f..56a5014e8e 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterImportPropMapper.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index 1dc3420d39..f91a2c8c39 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterPropHdl.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index 5983311bbe..613c7a893b 100644
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterPropHdl.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index ee8b657368..21cd698666 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterPropHdlFactory.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx
index a5e053f9e3..5001a2dd33 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.hxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterPropHdlFactory.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx
index 0662515ba1..cf27923288 100644
--- a/xmloff/source/style/PageMasterPropMapper.cxx
+++ b/xmloff/source/style/PageMasterPropMapper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterPropMapper.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx
index e08470cb26..1f267503e2 100644
--- a/xmloff/source/style/PageMasterPropMapper.hxx
+++ b/xmloff/source/style/PageMasterPropMapper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterPropMapper.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 5968a600f8..708b0a1549 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PageMasterStyleMap.cxx,v $
- * $Revision: 1.34 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 9148c00586..536db03477 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PagePropertySetContext.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx
index 337fe28029..0b499243b8 100644
--- a/xmloff/source/style/PagePropertySetContext.hxx
+++ b/xmloff/source/style/PagePropertySetContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PagePropertySetContext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx
index c977f66dc2..d01c7bed91 100644
--- a/xmloff/source/style/SinglePropertySetInfoCache.cxx
+++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SinglePropertySetInfoCache.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index 62b5c8c268..88516c3244 100644
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StyleMap.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 68a5597133..fc673e6eb1 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransGradientStyle.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index 66a20cc868..9d9b34c215 100644
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VisAreaContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx
index 18bfa89987..a45b63f502 100644
--- a/xmloff/source/style/VisAreaExport.cxx
+++ b/xmloff/source/style/VisAreaExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: VisAreaExport.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx
index eec884771f..5873ca1231 100644
--- a/xmloff/source/style/WordWrapPropertyHdl.cxx
+++ b/xmloff/source/style/WordWrapPropertyHdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: WordWrapPropertyHdl.cxx,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 5e7e5534c2..bbf89f0d57 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBackgroundImageContext.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx
index 9bb32a935c..c8136ce72e 100644
--- a/xmloff/source/style/XMLBackgroundImageExport.cxx
+++ b/xmloff/source/style/XMLBackgroundImageExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBackgroundImageExport.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
index 9acaad5a47..547edb1e5a 100644
--- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBitmapLogicalSizePropertyHandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
index 4792d6af02..6d4bf3e692 100644
--- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
+++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLBitmapRepeatOffsetPropertyHandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index 016ce350cc..5656a75fa7 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLClipPropertyHandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
index 34a92ce673..50702a74b1 100644
--- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx
+++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLConstantsPropertyHandler.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx
index c9647b6779..6985d72cf1 100644
--- a/xmloff/source/style/XMLElementPropertyContext.cxx
+++ b/xmloff/source/style/XMLElementPropertyContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLElementPropertyContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
index dfab24d514..90c35f849c 100644
--- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFillBitmapSizePropertyHandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index f45fb244b8..bb1a0cf2cc 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFontAutoStylePool.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 3bb6d98785..37b8aa2196 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFontStylesContext.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 2f44af15ca..bab0b92a7b 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteSeparatorExport.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
index 5e1632aba3..9b3081c53a 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteSeparatorExport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index cd07088eb1..f2ddb1e09c 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteSeparatorImport.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index d345d553ae..acd9e39e9f 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteSeparatorImport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
index 50b1c0c087..6f9a7108d3 100644
--- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
+++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIsPercentagePropertyHandler.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 3e1bc7e9b6..183ade4728 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLPageExport.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
index 59c152a589..7e4ffe5285 100644
--- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
+++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLPercentOrMeasurePropertyHandler.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx
index acf97ca1d4..9eacfa209a 100644
--- a/xmloff/source/style/XMLRectangleMembersHandler.cxx
+++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLRectangleMembersHandler.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index c23cf3d0e8..e6bc6dce25 100644
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: adjushdl.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx
index ba7b46ea9d..9fa1ba3bf0 100644
--- a/xmloff/source/style/adjushdl.hxx
+++ b/xmloff/source/style/adjushdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: adjushdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index 97c18a5325..ffb897eab3 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backhdl.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx
index 3107d50493..ccd08b9f5f 100644
--- a/xmloff/source/style/backhdl.hxx
+++ b/xmloff/source/style/backhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: backhdl.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 86ec25c5b5..3c2bafdad4 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bordrhdl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx
index 4a2e4bd090..602326f5be 100644
--- a/xmloff/source/style/bordrhdl.hxx
+++ b/xmloff/source/style/bordrhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: bordrhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index af781233bb..e5aaa05ca1 100644
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: breakhdl.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx
index b3deb58efa..3aaaf6fd78 100644
--- a/xmloff/source/style/breakhdl.hxx
+++ b/xmloff/source/style/breakhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: breakhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index d08bfe47de..2f40507578 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cdouthdl.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx
index 54507dc8a4..d03dbb8af2 100644
--- a/xmloff/source/style/cdouthdl.hxx
+++ b/xmloff/source/style/cdouthdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: cdouthdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index 7ea4605e15..17c47d8a56 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chrhghdl.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx
index 4a6968ef45..1fe8bd01ad 100644
--- a/xmloff/source/style/chrhghdl.hxx
+++ b/xmloff/source/style/chrhghdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chrhghdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index 0c65390787..fb15af28d9 100644
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chrlohdl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx
index e488634913..c297490e0b 100644
--- a/xmloff/source/style/chrlohdl.hxx
+++ b/xmloff/source/style/chrlohdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: chrlohdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx
index ef36ff9e70..2f98e580a3 100644
--- a/xmloff/source/style/csmaphdl.cxx
+++ b/xmloff/source/style/csmaphdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: csmaphdl.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx
index 65a32232e0..123833473b 100644
--- a/xmloff/source/style/csmaphdl.hxx
+++ b/xmloff/source/style/csmaphdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: csmaphdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx
index 47b51c1f6f..4533938428 100644
--- a/xmloff/source/style/durationhdl.cxx
+++ b/xmloff/source/style/durationhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: durationhdl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx
index a5bda51a0e..5254423511 100644
--- a/xmloff/source/style/durationhdl.hxx
+++ b/xmloff/source/style/durationhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: durationhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 5131ad4dd1..cc594031dd 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: escphdl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx
index b6955df254..852549f33b 100644
--- a/xmloff/source/style/escphdl.hxx
+++ b/xmloff/source/style/escphdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: escphdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 5ad8d761ae..5b5ec97526 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fonthdl.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx
index d167c92736..f5a92ebaa9 100644
--- a/xmloff/source/style/fonthdl.hxx
+++ b/xmloff/source/style/fonthdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: fonthdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 9822560f50..57ef3d454b 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impastp1.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index 9e3bb9bb60..afa0341c04 100644
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impastp2.cxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index e6c8b8fb82..6e4607ef0b 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impastp3.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index daec835a1f..6779623d5d 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impastp4.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 64aca01b6a..9194d82104 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: impastpl.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx
index 65211e30b2..4bd2a2c3b9 100644
--- a/xmloff/source/style/kernihdl.cxx
+++ b/xmloff/source/style/kernihdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kernihdl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx
index 1f69319032..72ce9b7478 100644
--- a/xmloff/source/style/kernihdl.hxx
+++ b/xmloff/source/style/kernihdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: kernihdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx
index 7c3638ede2..d73f5f1947 100644
--- a/xmloff/source/style/lspachdl.cxx
+++ b/xmloff/source/style/lspachdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lspachdl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx
index 6ac8591013..dbb8b16a47 100644
--- a/xmloff/source/style/lspachdl.hxx
+++ b/xmloff/source/style/lspachdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: lspachdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
index 83e3e8b42a..9c6b5e45e5 100644
--- a/xmloff/source/style/makefile.mk
+++ b/xmloff/source/style/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.32 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 530f32c97a..8e8d5414a3 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: numehelp.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx
index e6b2908da8..f2513f0bea 100644
--- a/xmloff/source/style/opaquhdl.cxx
+++ b/xmloff/source/style/opaquhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opaquhdl.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx
index 443fdcfeca..c56f5ea0fe 100644
--- a/xmloff/source/style/opaquhdl.hxx
+++ b/xmloff/source/style/opaquhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: opaquhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index 622ef189b6..adab57b04e 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postuhdl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx
index e0624a44c0..525b7d4d37 100644
--- a/xmloff/source/style/postuhdl.hxx
+++ b/xmloff/source/style/postuhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: postuhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 81530e129c..9c2d29d1df 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prhdlfac.cxx,v $
- * $Revision: 1.30.68.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 4f666b4fc3..339225812e 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: prstylei.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx
index ec728a3ac3..c2d9c20eab 100644
--- a/xmloff/source/style/shadwhdl.cxx
+++ b/xmloff/source/style/shadwhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shadwhdl.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx
index 7125d843f6..1fea25d5d5 100644
--- a/xmloff/source/style/shadwhdl.hxx
+++ b/xmloff/source/style/shadwhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shadwhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx
index 5b56d1a4da..a7dadfdfd1 100644
--- a/xmloff/source/style/shdwdhdl.cxx
+++ b/xmloff/source/style/shdwdhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shdwdhdl.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx
index 255ab82d88..a99953d5da 100644
--- a/xmloff/source/style/shdwdhdl.hxx
+++ b/xmloff/source/style/shdwdhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: shdwdhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index fa1877b481..62dcb73afb 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: styleexp.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx
index aff04d63a7..0a7c4d1d43 100644
--- a/xmloff/source/style/tabsthdl.cxx
+++ b/xmloff/source/style/tabsthdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabsthdl.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx
index 0362a9a38b..868cb4547c 100644
--- a/xmloff/source/style/tabsthdl.hxx
+++ b/xmloff/source/style/tabsthdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabsthdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 4560c9c516..fa1e83acff 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: undlihdl.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx
index 5e885f5b1d..130e1c086e 100644
--- a/xmloff/source/style/undlihdl.hxx
+++ b/xmloff/source/style/undlihdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: undlihdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/uniref.cxx b/xmloff/source/style/uniref.cxx
index 3503f3f7b0..f1c8c46c20 100644
--- a/xmloff/source/style/uniref.cxx
+++ b/xmloff/source/style/uniref.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: uniref.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 39585b04a3..3f4752bd5a 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: weighhdl.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx
index 209ed40f97..c1934b9151 100644
--- a/xmloff/source/style/weighhdl.hxx
+++ b/xmloff/source/style/weighhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: weighhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 4ed59fd092..abd389eb9e 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlaustp.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 152b1adbbd..99af22f13a 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbahdl.cxx,v $
- * $Revision: 1.28 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 9c4e1c3f0f..f2f3f2fc9c 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbahdl.hxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index eac3d834cc..18bea41c2a 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlexppr.cxx,v $
- * $Revision: 1.51 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 29f89db36b..7b29146da5 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlimppr.cxx,v $
- * $Revision: 1.43 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 2c86ee70f0..8b8628ea42 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.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: xmlnume.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 1fb40b3d05..ba456ccc10 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnumfe.cxx,v $
- * $Revision: 1.51 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index c61e7a87ca..2bb2577732 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlnumfi.cxx,v $
- * $Revision: 1.48 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index b96c7e9bb8..b706c999f6 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.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: xmlnumi.cxx,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx
index f86d342a7f..9f3f121394 100644
--- a/xmloff/source/style/xmlprcon.cxx
+++ b/xmloff/source/style/xmlprcon.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlprcon.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlprhdl.cxx b/xmloff/source/style/xmlprhdl.cxx
index b5e1b65dd2..666471a3d7 100644
--- a/xmloff/source/style/xmlprhdl.cxx
+++ b/xmloff/source/style/xmlprhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlprhdl.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index 6fbb674697..eb4347f4d7 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlprmap.cxx,v $
- * $Revision: 1.13.74.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 8d16668415..c089ec2260 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlstyle.cxx,v $
- * $Revision: 1.46 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index b59c8167e1..331ee5fe78 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltabe.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index e365ca3aac..a529767f17 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmltabi.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 7c8d3c5c2a..b7a59d778b 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTableExport.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index dbbb7bdbb9..256e911c03 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTableImport.cxx,v $
- * $Revision: 1.4.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk
index 7500fae4d0..df081d44f1 100644
--- a/xmloff/source/table/makefile.mk
+++ b/xmloff/source/table/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx
index af8539dc77..cee34e1ee9 100644
--- a/xmloff/source/table/table.hxx
+++ b/xmloff/source/table/table.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: table.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/table/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx
index 986a1d9585..46e94e9962 100644
--- a/xmloff/source/table/tabledesignsimporter.cxx
+++ b/xmloff/source/table/tabledesignsimporter.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: tabledesignsimporter.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
index 0684cb460c..62713b6b4f 100644
--- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx
+++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAnchorTypePropHdl.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx
index 7871b03434..99d736f93d 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.cxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoMarkFileContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx
index 7cb2f8c308..c86f801cdc 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.hxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoMarkFileContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index e350c76350..927036e23a 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoTextContainerEventImport.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index 8c0f8aed15..ede18b329a 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoTextContainerEventImport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 0a1e8527dc..a710ec76b5 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoTextEventExport.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index bf2e9d60d6..bd4f2fd1eb 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoTextEventExport.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 97c3ad719b..08c215c614 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoTextEventImport.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx
index 02cf42608f..0fd5097b8a 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLAutoTextEventImport.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx
index cf9cbbfb5b..14994e9fcb 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.cxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLCalculationSettingsContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx
index 4c35c49a4b..09fe29fe72 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.hxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLCalculationSettingsContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 1202b7cd69..4049810c7a 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangeElementImportContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index 9056c387c3..cd2f4e69bb 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangeElementImportContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index 56cd90fb7f..6b11ec098e 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangeImportContext.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx
index 1bc966f9c9..b73013443c 100644
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangeImportContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 1e8f521b91..52afaad7ae 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangeInfoContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx
index 91c4bfdfc3..693e6a1ac4 100644
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangeInfoContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 5a0cf0bec4..5a32132cf0 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangedRegionImportContext.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx
index af70f3cb17..30fa5b1935 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.hxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLChangedRegionImportContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index 619bdd0c0d..735d636897 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteBodyImportContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 669e2bea7c..2b2c2ad9c9 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteBodyImportContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 0087b0fa49..eff2fe5e3f 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteConfigurationImportContext.cxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index c0b0e94f77..159fd90f22 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteImportContext.cxx,v $
- * $Revision: 1.15.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx
index 3615e96aac..d4033921ae 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFootnoteImportContext.hxx,v $
- * $Revision: 1.5.66.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index ea71a83da3..ee37c1136a 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexAlphabeticalSourceContext.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index 558ed871b0..3b1ccff690 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexAlphabeticalSourceContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 967e69f8ca..bf5769dddf 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBibliographyConfigurationContext.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index 41ecbc32f0..efcd935e4d 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBibliographyEntryContext.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index 5acaac064e..e400ac0295 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBibliographyEntryContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index d30499a2b2..bffa54f35c 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBibliographySourceContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index 9e0d940f88..1b2eaa680f 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBibliographySourceContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx
index 02ae3afc20..0884e53fab 100644
--- a/xmloff/source/text/XMLIndexBodyContext.cxx
+++ b/xmloff/source/text/XMLIndexBodyContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBodyContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx
index d305c9e493..475d1fad19 100644
--- a/xmloff/source/text/XMLIndexBodyContext.hxx
+++ b/xmloff/source/text/XMLIndexBodyContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexBodyContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index ca75b6fc69..dc86be6df0 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.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: XMLIndexChapterInfoEntryContext.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/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index f3e766baaf..c9d91fa9a2 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexChapterInfoEntryContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index a82fc88aed..db11745d41 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexIllustrationSourceContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
index 48815a4a09..2786bda9bf 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexIllustrationSourceContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index 1c3a200dae..c81112a771 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexMarkExport.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index f31b6fecfb..61c12e911b 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexMarkExport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index d72b41104f..5154f801dc 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexObjectSourceContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index 0e14654589..6b8dddc373 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexObjectSourceContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index 78715d4f65..50797ebc6f 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexSimpleEntryContext.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
index 025c018a2c..a5a6465388 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexSimpleEntryContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 6314f348d8..5398dd0c3d 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexSourceBaseContext.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index 5c91b866b6..fe832ee4bf 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexSourceBaseContext.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
index da778b4ee6..55422a4856 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexSpanEntryContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
index 028cf45936..faf8e64761 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexSpanEntryContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 497a178760..f8788cf955 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTOCContext.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx
index dd35af9f30..f891e028ab 100644
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTOCContext.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index e1ad1b9975..059b6fec80 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTOCSourceContext.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index a554969a15..ec83e0ba14 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTOCSourceContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index ae43e705fb..dc9f5539d3 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTOCStylesContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index 1b6c2560a0..deb84cf75d 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTOCStylesContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 681b2c4256..46ef20bc5d 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTabStopEntryContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
index 8630eb7978..51cdcdbde4 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTabStopEntryContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index e79f6e8dc8..71bbd2b9b2 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTableSourceContext.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx
index 8cba6dc13b..353cbad405 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTableSourceContext.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 5376a4ed9e..f785360203 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTemplateContext.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 0b25ac391e..f5e691b57a 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTemplateContext.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
index a65730d2f7..087d48d073 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTitleTemplateContext.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
index 54bf8a3ff4..ee9c104582 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexTitleTemplateContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 6713a049f4..24e5f79f33 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexUserSourceContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index 3bce25a875..7bbce2b780 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLIndexUserSourceContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 02177ddc19..fbfea25825 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLineNumberingExport.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx
index d52f8656e9..84e0374d9b 100644
--- a/xmloff/source/text/XMLLineNumberingExport.hxx
+++ b/xmloff/source/text/XMLLineNumberingExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLineNumberingExport.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 139e123f4f..bd42a46594 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLineNumberingImportContext.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
index 5b192ee961..c0d0b4a2e6 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLineNumberingSeparatorImportContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
index 02dc2f86c0..bf2b9f197c 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLLineNumberingSeparatorImportContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index a8c52313a9..5c056d4a65 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLPropertyBackpatcher.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index bd70ab2f3d..b751f9524b 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLPropertyBackpatcher.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 2a3da1c569..0cfbc5890f 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLRedlineExport.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx
index 1a51e71fae..0def6e2186 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLRedlineExport.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index d87e33765f..954a8df01a 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.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: XMLSectionExport.cxx,v $
- * $Revision: 1.50 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index 428a823f0a..6eeabb8a0a 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.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: XMLSectionExport.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index e3b54fa3ec..432c231cd9 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionFootnoteConfigExport.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
index 768f44dc20..8859a9a323 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionFootnoteConfigExport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index ac696f9d1e..c4292b036c 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionFootnoteConfigImport.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
index 95c5dbb90b..cac39a3631 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionFootnoteConfigImport.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 3f916db8e0..1ae30d832b 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionImportContext.cxx,v $
- * $Revision: 1.27 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index d860a4e212..8e098af023 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionImportContext.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index a3c99c477d..415fbf1591 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionSourceDDEImportContext.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index 5de1c4a11b..46b9c0dcf7 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionSourceDDEImportContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 206d765f96..62c151d7bb 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionSourceImportContext.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index dbef1babeb..722384819e 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLSectionSourceImportContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index 1db837573e..a252ea577d 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLStringBufferImportContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index 2e2a21bd1f..fd891e447c 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextCharStyleNamesElementExport.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
index 90218b9083..41e6d61a4e 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextCharStyleNamesElementExport.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 5bb67f6986..1b712ab0f4 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextColumnsContext.cxx,v $
- * $Revision: 1.18 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 9c33e46465..889e808940 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextColumnsExport.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 14776996b7..d39e7eef81 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.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: XMLTextFrameContext.cxx,v $
- * $Revision: 1.75.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 4b3eece040..e2dffb7315 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.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: XMLTextFrameContext.hxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 9fae363ea5..6ded2b4d5c 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextFrameHyperlinkContext.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index 3b305f9eed..1aed0076ab 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextFrameHyperlinkContext.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 44588316e8..8d0ff4cb9a 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextHeaderFooterContext.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 26a4c4309e..7e5fb869a9 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextListAutoStylePool.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 208725f08e..369925c5a9 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.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: XMLTextListBlockContext.cxx,v $
- * $Revision: 1.13.2.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index d412e551a1..1ead860b5b 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.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: XMLTextListBlockContext.hxx,v $
- * $Revision: 1.9.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 2acb8da650..2f26f15c7c 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.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: XMLTextListItemContext.cxx,v $
- * $Revision: 1.12.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index 480b98a99d..c9de333065 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.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: XMLTextListItemContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 52384b0a40..735571d314 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMarkImportContext.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index 41ef7dcee0..6b228933fc 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMarkImportContext.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 214b2e3fde..547bef5c34 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMasterPageContext.cxx,v $
- * $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 7271afc935..1e34f9fe1d 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMasterPageExport.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index 8d64c280d4..f66f5df75d 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextMasterStylesContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 30895a5edc..5d37764d57 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.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: XMLTextNumRuleInfo.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 962f74c6c8..22badd6cc3 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.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: XMLTextNumRuleInfo.hxx,v $
- * $Revision: 1.10.64.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index de4f034b3f..e4e79701a4 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextPropertySetContext.cxx,v $
- * $Revision: 1.16 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx
index dd2fa24ad8..2d8d8e5616 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextPropertySetContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index 0c587ed23e..2bf8d29620 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextShapeImportHelper.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/source/text/XMLTextShapeImportHelper.hxx
index 35d474b6ed..b839c791c4 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.hxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextShapeImportHelper.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index d04fc57e52..8ee35eabb0 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextShapeStyleContext.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx
index 2ca3b19d6a..0859aaa220 100644
--- a/xmloff/source/text/XMLTextTableContext.cxx
+++ b/xmloff/source/text/XMLTextTableContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTextTableContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index 2ca1cfbb21..2ce2d33313 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTrackedChangesImportContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index 8dde08850c..5c2bb948c1 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLTrackedChangesImportContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
index 5851eeb090..c4330870c9 100644
--- a/xmloff/source/text/makefile.mk
+++ b/xmloff/source/text/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.37 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index 3a6cfa71f9..85d363bb6e 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtdrope.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index 980aec2623..139b5bd7ed 100644
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtdrope.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index f3b73ec30c..468cd637d2 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtdropi.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx
index 4e4c489bb5..459540904c 100644
--- a/xmloff/source/text/txtdropi.hxx
+++ b/xmloff/source/text/txtdropi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtdropi.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 8b267bba18..76269c64ab 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtexppr.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index dc47a82de6..a69d4d9ba7 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtexppr.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index ee9ddbeef4..d315ea7256 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtflde.cxx,v $
- * $Revision: 1.84.102.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 3b8b551b92..d1c1bdc81c 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtfldi.cxx,v $
- * $Revision: 1.71.66.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index c8b2b0158c..9940046b81 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtftne.cxx,v $
- * $Revision: 1.24 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b26953b3df..616d26b17b 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.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: txtimp.cxx,v $
- * $Revision: 1.143.2.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 34f1ca038f..1e86500f6f 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtimppr.cxx,v $
- * $Revision: 1.25 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 47345fddef..16c3382f6a 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.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: txtlists.cxx,v $
- * $Revision: 1.2.24.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 21df9d374c..7b2f9f734f 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.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: txtparae.cxx,v $
- * $Revision: 1.153 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index fa68a86bdf..49481ebb21 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtparai.cxx,v $
- * $Revision: 1.68.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 274c212d7f..e8b36ec019 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtparai.hxx,v $
- * $Revision: 1.14.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index e0975411a5..fa1163a5a5 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtparaimphint.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index cff7eee8d9..87fc98c58d 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtprhdl.cxx,v $
- * $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx
index 12de2756ac..0accb074c2 100644
--- a/xmloff/source/text/txtprhdl.hxx
+++ b/xmloff/source/text/txtprhdl.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtprhdl.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index e68469f561..794d1eb0d4 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtprmap.cxx,v $
- * $Revision: 1.106.36.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index bd05aa4ba2..74e6fc706f 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.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: txtsecte.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index d9e061be84..c59a6e629f 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtstyle.cxx,v $
- * $Revision: 1.26 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 1e4dab709f..d7fd493c51 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtstyli.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index c419ee0383..978e20bf9c 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: txtvfldi.cxx,v $
- * $Revision: 1.36 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ActionMapTypesOASIS.hxx b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index 32f659bbd0..33947a719e 100644
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ActionMapTypesOASIS.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ActionMapTypesOOo.hxx b/xmloff/source/transform/ActionMapTypesOOo.hxx
index 08b4857f56..a68e149f8c 100644
--- a/xmloff/source/transform/ActionMapTypesOOo.hxx
+++ b/xmloff/source/transform/ActionMapTypesOOo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ActionMapTypesOOo.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx
index e1971dd9a6..aea51aa096 100644
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: AttrTransformerAction.hxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index 2937f77400..1dad21eed0 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartOASISTContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx
index 07d97c90ff..af8f001723 100644
--- a/xmloff/source/transform/ChartOASISTContext.hxx
+++ b/xmloff/source/transform/ChartOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartOASISTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx
index dea76f27b2..4cf148aadf 100644
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartOOoTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx
index c626861158..36faf69016 100644
--- a/xmloff/source/transform/ChartOOoTContext.hxx
+++ b/xmloff/source/transform/ChartOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartOOoTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index 796adf506d..fa33d0c45b 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartPlotAreaOASISTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
index ed62116f2c..b16eb0e235 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartPlotAreaOASISTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
index 03fd9429c9..b920d3fd78 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartPlotAreaOOoTContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
index 4466c599ae..d6213bdad1 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ChartPlotAreaOOoTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx
index bcb5bb8729..c6830580bc 100644
--- a/xmloff/source/transform/ControlOASISTContext.cxx
+++ b/xmloff/source/transform/ControlOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlOASISTContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx
index ac0359acc1..c58de66c47 100644
--- a/xmloff/source/transform/ControlOASISTContext.hxx
+++ b/xmloff/source/transform/ControlOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlOASISTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx
index 783b312565..7d40aefc52 100644
--- a/xmloff/source/transform/ControlOOoTContext.cxx
+++ b/xmloff/source/transform/ControlOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlOOoTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx
index 5a4c68914a..6198dae7ad 100644
--- a/xmloff/source/transform/ControlOOoTContext.hxx
+++ b/xmloff/source/transform/ControlOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ControlOOoTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx
index cc667798eb..ba286b651f 100644
--- a/xmloff/source/transform/CreateElemTContext.cxx
+++ b/xmloff/source/transform/CreateElemTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CreateElemTContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx
index c6b08dc5d9..b47df6d5c5 100644
--- a/xmloff/source/transform/CreateElemTContext.hxx
+++ b/xmloff/source/transform/CreateElemTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: CreateElemTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx
index 21c8af98bf..5dd6962d53 100644
--- a/xmloff/source/transform/DeepTContext.cxx
+++ b/xmloff/source/transform/DeepTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DeepTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx
index 316ecf0a4a..6fd9ff52d5 100644
--- a/xmloff/source/transform/DeepTContext.hxx
+++ b/xmloff/source/transform/DeepTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DeepTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx
index 6a4816e0b3..4074e0a566 100644
--- a/xmloff/source/transform/DlgOASISTContext.cxx
+++ b/xmloff/source/transform/DlgOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DlgOASISTContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx
index e4a4457e73..62db07bff3 100644
--- a/xmloff/source/transform/DlgOASISTContext.hxx
+++ b/xmloff/source/transform/DlgOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DlgOASISTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx
index 89675428cc..4fe8fc2e9d 100644
--- a/xmloff/source/transform/DocumentTContext.cxx
+++ b/xmloff/source/transform/DocumentTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocumentTContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx
index 3cefc77505..b0a11d902c 100644
--- a/xmloff/source/transform/DocumentTContext.hxx
+++ b/xmloff/source/transform/DocumentTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: DocumentTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ElemTransformerAction.hxx b/xmloff/source/transform/ElemTransformerAction.hxx
index 70115c5796..b2d0989997 100644
--- a/xmloff/source/transform/ElemTransformerAction.hxx
+++ b/xmloff/source/transform/ElemTransformerAction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ElemTransformerAction.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index d65c6cc0df..4356a2bf12 100644
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventMap.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index b47795d106..253840d001 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventMap.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 96acba4e50..655a35c572 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventOASISTContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx
index 620b8a403c..4ae0619a88 100644
--- a/xmloff/source/transform/EventOASISTContext.hxx
+++ b/xmloff/source/transform/EventOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventOASISTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index cc5e796f06..64e9e2dd9b 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventOOoTContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx
index d2c1cefcdf..f14e18bc5c 100644
--- a/xmloff/source/transform/EventOOoTContext.hxx
+++ b/xmloff/source/transform/EventOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: EventOOoTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FamilyType.hxx b/xmloff/source/transform/FamilyType.hxx
index 729f48aea5..396c42efd3 100644
--- a/xmloff/source/transform/FamilyType.hxx
+++ b/xmloff/source/transform/FamilyType.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FamilyType.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx
index ad80390eff..2c94b86aae 100644
--- a/xmloff/source/transform/FlatTContext.cxx
+++ b/xmloff/source/transform/FlatTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FlatTContext.cxx,v $
- * $Revision: 1.6.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx
index 9c8afa39c8..c76da762e1 100644
--- a/xmloff/source/transform/FlatTContext.hxx
+++ b/xmloff/source/transform/FlatTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FlatTContext.hxx,v $
- * $Revision: 1.4.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx
index 3646f5f2e8..e7d80a5153 100644
--- a/xmloff/source/transform/FormPropOASISTContext.cxx
+++ b/xmloff/source/transform/FormPropOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FormPropOASISTContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx
index 806c5ec7e3..67b9875ae2 100644
--- a/xmloff/source/transform/FormPropOASISTContext.hxx
+++ b/xmloff/source/transform/FormPropOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FormPropOASISTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index af214f874a..f7e42c56dd 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FormPropOOoTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx
index 168f5d0882..9e148ba8dd 100644
--- a/xmloff/source/transform/FormPropOOoTContext.hxx
+++ b/xmloff/source/transform/FormPropOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FormPropOOoTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx
index f1ed44dd05..533b74d2f5 100644
--- a/xmloff/source/transform/FrameOASISTContext.cxx
+++ b/xmloff/source/transform/FrameOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FrameOASISTContext.cxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx
index 01651cf7f3..a36e25e8b5 100644
--- a/xmloff/source/transform/FrameOASISTContext.hxx
+++ b/xmloff/source/transform/FrameOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FrameOASISTContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx
index 6c5a2b0b21..253b30e9bd 100644
--- a/xmloff/source/transform/FrameOOoTContext.cxx
+++ b/xmloff/source/transform/FrameOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FrameOOoTContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx
index 1d0479a4e9..dfeaa9b6fc 100644
--- a/xmloff/source/transform/FrameOOoTContext.hxx
+++ b/xmloff/source/transform/FrameOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: FrameOOoTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx
index 9a1aa6f17f..e7632e9643 100644
--- a/xmloff/source/transform/IgnoreTContext.cxx
+++ b/xmloff/source/transform/IgnoreTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IgnoreTContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx
index 0f002d6e39..a9fcfc92f3 100644
--- a/xmloff/source/transform/IgnoreTContext.hxx
+++ b/xmloff/source/transform/IgnoreTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: IgnoreTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index e6fc9e9cfd..848e6da9a3 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MergeElemTContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx
index ab88e51236..b2b062c8a9 100644
--- a/xmloff/source/transform/MergeElemTContext.hxx
+++ b/xmloff/source/transform/MergeElemTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MergeElemTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index 20f591a192..36a61f2fda 100644
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MetaTContext.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index 52d0797691..251a3d9f31 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MetaTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index bdf0de6318..775907f0fd 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MutableAttrList.cxx,v $
- * $Revision: 1.10.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index 9d9ce00bdb..c6fcdc95e2 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: MutableAttrList.hxx,v $
- * $Revision: 1.4.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 3106703967..2f4db7f01c 100644
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NotesTContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx
index f9daeeb8f6..aed2fcf2e4 100644
--- a/xmloff/source/transform/NotesTContext.hxx
+++ b/xmloff/source/transform/NotesTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: NotesTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 8d4cf844a1..ed2f7543c9 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OOo2Oasis.cxx,v $
- * $Revision: 1.23.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 1cdca007ef..d125ca7254 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: OOo2Oasis.hxx,v $
- * $Revision: 1.6.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 22fcdc2719..73c3598bdd 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Oasis2OOo.cxx,v $
- * $Revision: 1.24.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 8c05a8aa88..1f08d1e787 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Oasis2OOo.hxx,v $
- * $Revision: 1.5.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx
index ce2ac133c2..24a08349c6 100644
--- a/xmloff/source/transform/PersAttrListTContext.cxx
+++ b/xmloff/source/transform/PersAttrListTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PersAttrListTContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx
index c7c15e30c3..73718d3ca9 100644
--- a/xmloff/source/transform/PersAttrListTContext.hxx
+++ b/xmloff/source/transform/PersAttrListTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PersAttrListTContext.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx
index c7d0daa56c..7119dd4853 100644
--- a/xmloff/source/transform/PersMixedContentTContext.cxx
+++ b/xmloff/source/transform/PersMixedContentTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PersMixedContentTContext.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx
index 7155fce525..d9fd5a72ed 100644
--- a/xmloff/source/transform/PersMixedContentTContext.hxx
+++ b/xmloff/source/transform/PersMixedContentTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PersMixedContentTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx
index 8fc0695ae0..cf01a6ae44 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProcAddAttrTContext.cxx,v $
- * $Revision: 1.7.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx
index a28f78c626..d750a982fc 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProcAddAttrTContext.hxx,v $
- * $Revision: 1.4.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx
index b863321563..9b154f20bf 100644
--- a/xmloff/source/transform/ProcAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAttrTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProcAttrTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx
index 089935ce79..a0effc5eab 100644
--- a/xmloff/source/transform/ProcAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAttrTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: ProcAttrTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PropType.hxx b/xmloff/source/transform/PropType.hxx
index 7da1c56e19..fa24cca1bf 100644
--- a/xmloff/source/transform/PropType.hxx
+++ b/xmloff/source/transform/PropType.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropType.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index 1a054e86ff..2904c3a48e 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyActionsOASIS.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 1eacb7f193..b252986cb3 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyActionsOASIS.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index 50f75af995..d8639e4de1 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyActionsOOo.cxx,v $
- * $Revision: 1.19 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index f60daf4a4b..0fc51e4b2d 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: PropertyActionsOOo.hxx,v $
- * $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/RenameElemTContext.cxx b/xmloff/source/transform/RenameElemTContext.cxx
index 7f28fd1cd0..44843fa7b3 100644
--- a/xmloff/source/transform/RenameElemTContext.cxx
+++ b/xmloff/source/transform/RenameElemTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RenameElemTContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx
index a519685e45..1f70d7fe3e 100644
--- a/xmloff/source/transform/RenameElemTContext.hxx
+++ b/xmloff/source/transform/RenameElemTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: RenameElemTContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 2dd8552b98..80375cbcf1 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StyleOASISTContext.cxx,v $
- * $Revision: 1.17 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx
index 11b04d3b35..5f1211d912 100644
--- a/xmloff/source/transform/StyleOASISTContext.hxx
+++ b/xmloff/source/transform/StyleOASISTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StyleOASISTContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 544c05b56d..f5c651d114 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StyleOOoTContext.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx
index 3267be5362..935bfe3a2a 100644
--- a/xmloff/source/transform/StyleOOoTContext.hxx
+++ b/xmloff/source/transform/StyleOOoTContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: StyleOOoTContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TContextVector.hxx b/xmloff/source/transform/TContextVector.hxx
index 12eb32a562..4a9621aa8c 100644
--- a/xmloff/source/transform/TContextVector.hxx
+++ b/xmloff/source/transform/TContextVector.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TContextVector.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/Transformer.hxx b/xmloff/source/transform/Transformer.hxx
index d346c95483..334ccf3120 100644
--- a/xmloff/source/transform/Transformer.hxx
+++ b/xmloff/source/transform/Transformer.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: Transformer.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerAction.hxx b/xmloff/source/transform/TransformerAction.hxx
index 34d1c6f156..6421476946 100644
--- a/xmloff/source/transform/TransformerAction.hxx
+++ b/xmloff/source/transform/TransformerAction.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerAction.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerActionInit.hxx b/xmloff/source/transform/TransformerActionInit.hxx
index 65eaec180e..5b6b1ba494 100644
--- a/xmloff/source/transform/TransformerActionInit.hxx
+++ b/xmloff/source/transform/TransformerActionInit.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerActionInit.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx
index a9cf23a5e6..c14e6a3303 100644
--- a/xmloff/source/transform/TransformerActions.cxx
+++ b/xmloff/source/transform/TransformerActions.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerActions.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index 07f2ec96e1..8fd00e727b 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerActions.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index b1ce8c4995..a3d7747eda 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerBase.cxx,v $
- * $Revision: 1.23.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index b3fb3f629a..6e60c8f01a 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerBase.hxx,v $
- * $Revision: 1.9.56.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx
index f4571bab5c..6a28d35b42 100644
--- a/xmloff/source/transform/TransformerContext.cxx
+++ b/xmloff/source/transform/TransformerContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerContext.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx
index 63c35af147..62b31493e8 100644
--- a/xmloff/source/transform/TransformerContext.hxx
+++ b/xmloff/source/transform/TransformerContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerContext.hxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerTokenMap.cxx b/xmloff/source/transform/TransformerTokenMap.cxx
index bd402cfeac..a3020cf2fa 100644
--- a/xmloff/source/transform/TransformerTokenMap.cxx
+++ b/xmloff/source/transform/TransformerTokenMap.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerTokenMap.cxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index 0536bd9139..9e51010c06 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TransformerTokenMap.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 912b19afd0..e3bb398a61 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XMLFilterRegistration.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk
index acd80bb1f3..9f55dc48ca 100644
--- a/xmloff/source/transform/makefile.mk
+++ b/xmloff/source/transform/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.13 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index f037a1b021..f0ed56b31b 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchemaContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index b862872d0e..52a7ace579 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchemaContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index f48101288f..20e5faf93b 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchemaRestrictionContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 19277c442f..059ac78c83 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchemaRestrictionContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index f64853886c..3a7ffadc8c 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchemaSimpleTypeContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index decb80f8d4..b1e6b653c8 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: SchemaSimpleTypeContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 8fd91b12d5..4b92dbfaad 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TokenContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 413a4ea7d8..77d22a7b4f 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: TokenContext.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 0f8b6a61f3..cc2af7db31 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsBindContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index d7997487d2..a60eac48ed 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsBindContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index e40e540b2f..7a5ac4faa0 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsInstanceContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index f75925abe0..01235bfebb 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsInstanceContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 91941bdb69..d1547e46df 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsModelContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index 0df183a038..585237c527 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsModelContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsModelExport.hxx b/xmloff/source/xforms/XFormsModelExport.hxx
index fd21ad3198..2286d9ea2f 100644
--- a/xmloff/source/xforms/XFormsModelExport.hxx
+++ b/xmloff/source/xforms/XFormsModelExport.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsModelExport.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 1c4be38f8c..2c643d792c 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsSubmissionContext.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 834def1db6..f95dbf8d43 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: XFormsSubmissionContext.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk
index dc4286678f..b88445b9e9 100644
--- a/xmloff/source/xforms/makefile.mk
+++ b/xmloff/source/xforms/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index b7df909679..c687e412fe 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xformsapi.cxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 078b802f29..a83fa4f349 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xformsapi.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index d89906ffd8..3b16243f44 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xformsexport.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index dbe575e1d3..2d9eb56ccf 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xformsimport.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 31852e1517..4ee6adfcfe 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.32 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmloff/util/makefile.pmk b/xmloff/util/makefile.pmk
index 8a3e723b32..7b0fdb442c 100644
--- a/xmloff/util/makefile.pmk
+++ b/xmloff/util/makefile.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd
index 5ee7834f08..8b7cdf436b 100644
--- a/xmlscript/dtd/dialog.dtd
+++ b/xmlscript/dtd/dialog.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: dialog.dtd,v $
- 
-  $Revision: 1.28 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean "(true|false)">
diff --git a/xmlscript/dtd/libraries.dtd b/xmlscript/dtd/libraries.dtd
index 92dd5c726c..02c41bb9ae 100644
--- a/xmlscript/dtd/libraries.dtd
+++ b/xmlscript/dtd/libraries.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: libraries.dtd,v $
- 
-  $Revision: 1.5 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean "(true|false)">
diff --git a/xmlscript/dtd/library.dtd b/xmlscript/dtd/library.dtd
index 86ddeb01cc..6e96c1c1b5 100644
--- a/xmlscript/dtd/library.dtd
+++ b/xmlscript/dtd/library.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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: library.dtd,v $
- 
-  $Revision: 1.4 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean "(true|false)">
diff --git a/xmlscript/dtd/module.dtd b/xmlscript/dtd/module.dtd
index 7607b65558..5b78d24c8b 100644
--- a/xmlscript/dtd/module.dtd
+++ b/xmlscript/dtd/module.dtd
@@ -2,32 +2,28 @@
 <!--
 
   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.dtd,v $
- 
-  $Revision: 1.3 $
- 
+
   This file is part of OpenOffice.org.
- 
+
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
- 
+
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
- 
+
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT script:module (#PCDATA)>
diff --git a/xmlscript/inc/makefile.mk b/xmlscript/inc/makefile.mk
index 7a97646e7c..1e14990799 100644
--- a/xmlscript/inc/makefile.mk
+++ b/xmlscript/inc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/inc/pch/precompiled_xmlscript.cxx b/xmlscript/inc/pch/precompiled_xmlscript.cxx
index 8bd253a6ad..7998575efe 100644
--- a/xmlscript/inc/pch/precompiled_xmlscript.cxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_xmlscript.cxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/pch/precompiled_xmlscript.hxx b/xmlscript/inc/pch/precompiled_xmlscript.hxx
index 080583a073..31ddc8cda8 100644
--- a/xmlscript/inc/pch/precompiled_xmlscript.hxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: precompiled_xmlscript.hxx,v $
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index d492d126e2..373a22c070 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_helper.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/xmlscript/xml_import.hxx b/xmlscript/inc/xmlscript/xml_import.hxx
index edd49d6508..6e407d7051 100644
--- a/xmlscript/inc/xmlscript/xml_import.hxx
+++ b/xmlscript/inc/xmlscript/xml_import.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_import.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 9e5d443d3d..fca73bc014 100644
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmldlg_imexp.hxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index e890049abe..fd28a7a71f 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmllib_imexp.hxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index 7052bee52f..f505f3d531 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmod_imexp.hxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/inc/xmlscript/xmlns.h b/xmlscript/inc/xmlscript/xmlns.h
index 0917b12cd7..4ab2c18376 100644
--- a/xmlscript/inc/xmlscript/xmlns.h
+++ b/xmlscript/inc/xmlscript/xmlns.h
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlns.h,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index e5c8ce0e5b..50435002a3 100644
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: misc.hxx,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/misc/makefile.mk b/xmlscript/source/misc/makefile.mk
index fbd7b0b098..e86e06ae35 100644
--- a/xmlscript/source/misc/makefile.mk
+++ b/xmlscript/source/misc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 891fe518a0..b95665eef0 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: unoservices.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xml_helper/makefile.mk b/xmlscript/source/xml_helper/makefile.mk
index e5e96ff686..a87c62740c 100644
--- a/xmlscript/source/xml_helper/makefile.mk
+++ b/xmlscript/source/xml_helper/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index b2aa0d0217..a2e3fc2ccd 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_byteseq.cxx,v $
- * $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 26fd9c30d3..7fe5436ffd 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_element.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index afab81e404..2a0a260f86 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xml_impctx.cxx,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx
index 4cf3b2ff5d..f5bc51684e 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: common.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 9d5ab99635..ae62907712 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: exp_share.hxx,v $
- * $Revision: 1.21 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 8c5645335b..01e8dcda7a 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imp_share.hxx,v $
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/makefile.mk b/xmlscript/source/xmldlg_imexp/makefile.mk
index 86b57a27f6..d27b900ffd 100644
--- a/xmlscript/source/xmldlg_imexp/makefile.mk
+++ b/xmlscript/source/xmldlg_imexp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index af119ec99c..cd87f8c000 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmldlg_addfunc.cxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index ef8f8526f7..c739a144b3 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmldlg_expmodels.cxx,v $
- * $Revision: 1.38 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index f5c660c53e..3b1decef1d 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmldlg_export.cxx,v $
- * $Revision: 1.40 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 47a79a5453..2b6620f149 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmldlg_impmodels.cxx,v $
- * $Revision: 1.44 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 99a8361141..2af4dc357d 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmldlg_import.cxx,v $
- * $Revision: 1.37 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlflat_imexp/makefile.mk b/xmlscript/source/xmlflat_imexp/makefile.mk
index 8d6f9fbfa9..043054a8a9 100644
--- a/xmlscript/source/xmlflat_imexp/makefile.mk
+++ b/xmlscript/source/xmlflat_imexp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 7a8b980d4c..f5f4b99860 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbas_export.cxx,v $
- * $Revision: 1.6.10.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index 7821452886..5b535dbc68 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbas_export.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index c1feece98d..9e6c63d42c 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbas_import.cxx,v $
- * $Revision: 1.6.10.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 543b4f1a1e..9572dcb912 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlbas_import.hxx,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx
index d602103fa7..8f9765d36c 100644
--- a/xmlscript/source/xmllib_imexp/imp_share.hxx
+++ b/xmlscript/source/xmllib_imexp/imp_share.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imp_share.hxx,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmllib_imexp/makefile.mk b/xmlscript/source/xmllib_imexp/makefile.mk
index 2d29c3d2d4..bb9b0f64be 100644
--- a/xmlscript/source/xmllib_imexp/makefile.mk
+++ b/xmlscript/source/xmllib_imexp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
index e7d40405bf..a3933cefd7 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmllib_export.cxx,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index b533d37c53..bac997d4dc 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmllib_import.cxx,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index f7f4e248ad..e8a3b996e5 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imp_share.hxx,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlmod_imexp/makefile.mk b/xmlscript/source/xmlmod_imexp/makefile.mk
index 96d74a41dd..eee9dc6b5a 100644
--- a/xmlscript/source/xmlmod_imexp/makefile.mk
+++ b/xmlscript/source/xmlmod_imexp/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
index a14f62e8f9..ba23ad031f 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmod_export.cxx,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 61b636b382..b995817c1e 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: xmlmod_import.cxx,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index ae4853b118..28fdd6c103 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -1,13 +1,10 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * $RCSfile: imexp.cxx,v $
- * $Revision: 1.20 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
  * This file is part of OpenOffice.org.
  *
diff --git a/xmlscript/test/makefile.mk b/xmlscript/test/makefile.mk
index e831544e39..3574677747 100644
--- a/xmlscript/test/makefile.mk
+++ b/xmlscript/test/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
index ae1479cd5b..c3167d7726 100644
--- a/xmlscript/util/makefile.mk
+++ b/xmlscript/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.12 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xmlscript/util/target.pmk b/xmlscript/util/target.pmk
index 900943dba1..c370414d3d 100644
--- a/xmlscript/util/target.pmk
+++ b/xmlscript/util/target.pmk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: target.pmk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #