CWS-TOOLING: integrate CWS changefileheader3ooo/OOO320_m14

47 files changed, 98 insertions, 263 deletions

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.
  *